Get rid of EXEC macro
Get rid of EXEC_S macro