This change runs into a bug in visual studio 2005 that I can't seem
to find a way to avoid.  Might try it again later, but for now, I'm backing
it out.