Fixed macro expansions and removed unused macro expansions.
Merge branch 'master' of https://github.com/urbit/urbit