Migrate from dict to list of tuples in scan.