Simplified dictionary constructions using new C++11 / onion constructor from maps. Fixed pass properly rw-envvars.