Fix list-y fails.

This and the previous commit close #3