Begin fix for constraint modification code.