Decouple null_to_na from unlist