Remove macro hacks for internal vs. external functions. Part 2 and last.