annoyingly large set of changes for small impact - I will get to it but this low priority

I'm not critiquing your work - just the fact this had to touch so much code which wasn't obvious from the initial suggestion