Implicit clean up.
Immutable map.
Modules changed to traits for cake-like mixing.