Yeah, the long-ish history and amount of devices & FW versions make this sort of thing fairly hard to future-proof

.
And not wanting to potentially mess up a backport in criticial, but old & stable code is probably why I never actually "fixed" that at the root (i.e., by installing the dispatch script in the old JB).
The fact that we "fixed" that by cutting down the "factory" JB to the bare minimum and explicitly required the installation of the hotfix also limited the interest in tweaking the old code

.