P-1204: use identical structure for lists