changing the way API deals with null objects: added _nullify_ macros to output code