I put up a bug report patch that should address the issue, and an unrelated one I found while working on it.
