Improve list handling.