Moar ap.c fixes, added macro expansions
Merge branch 'nextbreach' of https://github.com/urbit/urbit into nextbreach