Added macros with-graph and within-tx to simplify things
Improved type checking