Now we have the new `module' command, use it.

[originally from svn r7224]