Remove wrapper macros from wrap_cpp