Bullseye, @spiffxp! I did an experiment and left this change out and now all tests pass nicely.  I will look into an updated (=working) solution tomorrow; it is getting late in this neck of the woods.