1.0.20.3: Minor refactoring in constraint propagation.