Fixed problems with how macro expansions worked. Now works properly (again)