More progress on the module system.