Implement MACRO, fix up local var indexing issues