Should we have a function `make_list_if_necessary` or something like that to clean up the code?