Simplify Module/Submodule statement argument usage