Macro handling within module indent method

Macros used within the module definition are now handled as they are everywhere
else in the code.
Rework indent_module method

Split it into two separate methods.