Last (hopefully) adjustment to constraint generating modules.