Wrap requirements.
Further improve requirements mangling.
Add requirements check.
More fixes to requirements.
Improve generation of configuration files.