Added new %define to clean up name shuffling for wrap functions.  #1295