towards Win64

Working towards #609
Still trying to get the unittests running.
I really missed that change. Great catch!