Mostly it's just me trying to catch up, since I didn't have time to help look at this earlier (since being flagged in to take a look a couple of days ago), but yeah, I guess it's not so directly useful at this point (probably mostly just annoying).

The comment below this was just a "heads up" for the future, but this one here was a potential discussion point, around what will lead to the cleanest code / data structures, potentially leading to a small pull request if we decided it was worth a change.