Revert "Revert "Generator recursive containers""

This reverts commit 6491a18dd80964e167218f1e7cc3d30fc244be3a.