Improve jmacro support (add support for statemets as well as expressions).