Happy end of record persistence story; better headings.