Clean up handling of NULL(-like) values in data_value()