Complete conversion of more entries into the new format.