Added moar ap.c macro expansions.