Improve support for records-in-records.