Corrected the generation of constraints etc. with/without the "no-package" option.