Added bunting macro expansions to ap.c