More prep. for dyn. env. mapping.

Plus general optimizations,.