Changed order in define-module so that modularise comes before the expansion.
This is important so that expansion options can have access to the module's storage.