Added NULL to nil convert macro