Better empty list handling.