Add support for macrocalls and for begin ... end blocks.