Cpp: Internal API change; pass the CPP object to macro functions. The macro magic functions now get the CPP object (and not its storage) as the first argument. This is to make it possible to call functions in the object from the macro magic functions.