Minor changes to explicit constraint code.