Use new stack macros from global-jjb csit-3node