Moar ap.c macro expansions