Updates to ensure better marker propagation, correct a
constraint-parsing bug, etc