Some better ifdefs in griffin.c