Fixed some of the constraint/expression loop constructs.