Thanks for the fix. I was unhappy with the ugly situation that made this so easy to miss, so I cleaned it up instead so that such changes now only need to be made in one file.