Massive and tedious refactoring started.

With the menv end cenv in the closures now, it makes no sense for them
to be separate arguments to all of the functions.