I can verify that today, if you all agree that this is the best approach to handling an override of the main script stage. Either way it should be benign when not using this addon. Any objection to pushing to staging in earnest?