Mostly I made the code more consist with the other methods in this file, and
also made `using_list` to be more literal (i.e. not to include tuples as
well)