Make 2.2 APIs more readable and correct errors in persistence sections.