This does look much cleaner to implement than using several additional atom types. It looks like it is doing exactly what I needed in my small test system. Thanks for sharing your expertise.
For those who find this post later, I had to implement the “fix store/state” solution from this post to successfully write the dump.