Fixed an issue with iterative macro expansion.
Was signalling an error on null statements in blocks.
Test cases for macro handling.