Oh, bummer--looks like I somehow reverted to the old code too.  Sorry, I'll have to redo the changes you suggested in the old pull request.