Remove special casing for list