Thanks, I hope the patch is helpful as well, you can see from it that I actually removed some of the casts because they were unnecessary (perhaps they were copy/paste leftovers).