undo most special-casing around lists