Here's the latest patch. If I should send it as a new email to the bug address, or create a new bug like Lars suggested, I can do that.