Tweaked and tested the code revisions from last time.  Everything works as expected now.