Fix variable name.
Remove some hacks for old VC10 bugs.