Modules changed to traits for cake-like mixing.