More simplification of module code.