Commenting and cleaning up constraint generation.