Apr 28, 2023

I've merged the changes described above, and am performing a full sync. Sync time is reduced slightly as a consequence of collapsing the redundant fields. Once sync is complete I'll be able to measure the change to confirmation.