Get rid of nasty macros in interpret.c