If you need to resubmit, please consider re-ordering the changes to due the comparison to NULL changes in your first patch, followed by the other two in either order. I think it will clear up some of the inconsistency in your first patch.
Thanks, Robin