Updated Builtin collections to handle substitution internally
Optimizing the substitution/evaluation operations.
suppressing unchecked warnings