Initial add of the entry/exit gate macros for nested calls