Remove NULL, \N handling for now.  Possibly add back in a generic way