Never mind. This pull request seems to do what I suggested already.