Rewrite for new module specifications.