Minor: Better handling of empty string values.