Many fixes to list parsing.