retry #108: No longer use deprecated generators.