Move zaptrcallerid out of #define ZAPATA_PRI