@fancy-queen-20734 : can you elaborate on:

+// I think I ought to be able to replace the below with a set of structs keyed by EntryType.
 +// My first couple attempts failed.