2 weeks later and I still haven't done it, I know. Been swamped and generally unmotivated. Not sure when I will pick this up, but assassin pretty much laid it out for you if you want to manually insert the fix along with his patch. If anyone else wants to take it on, you're welcome to - if not, I'll do it when my schedule opens up and I'm not feeling so drained by life. Sorry again.