Indeed. It sounds like you've made some real headway in terms of unifying the codebase, so kudos for that alone.
I have a couple of Vista machines that I can poke around in, and I have numerous XP machines at Uni that I think I can test on as well - I'll know more tomorrow.
I am I.