Unionize range in ConstraintSyntax
First pass cleanup of utility functions in parser