Added moar macro expansions to ap.c