Some more progress.

Mostly un-finite mapping things. A surprising amount depends on being
able to access various shadowed bindings.