fix uses of old nullptr macro