Csvlist and Figlist are handled more nicely now.