Thanks for sticking with this @ajdawson.
As @pelson already raised much the same points yesterday morning, I think after all it's best to just make this change, so here goes ...