This commits the changes to STACK macros forced by recent ENGINE surgery.