removed all explicit fix macros; makefun now handles the injection step