Reimar - after you look at the patch and confirm that there's nothing wrong, I can split it into smaller logical patches if you would like me to. I'm working on other problems as well and will commit changes very soon.