r18048: More nested structures