Get rid of function wrappers now that we dont use amdefine