Clearly I didn't test that last commit well enough.  Everything looks good now.