Really get rid of the MSVC 2005 workaround completely

Because I'm an idiot that missed these.