diff --git a/PCbuild/_tkinter.dsp b/PCbuild/_tkinter.dsp
index 5727ae4..33cfb05 100644
--- a/PCbuild/_tkinter.dsp
+++ b/PCbuild/_tkinter.dsp
@@ -20,8 +20,8 @@
 !MESSAGE 
 !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
 !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
-!MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@
 # PROP Scc_ProjName "_tkinter"
 # PROP Scc_LocalPath "..\..\.."
 
-!IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
+!IF  "$(CFG)" == "_tkinter - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -60,7 +60,7 @@
 # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib tcl80.lib tk80.lib /nologo /base:"0x1e190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_tkinter.pyd" /libpath:"C:\Program Files\Tcl\lib" /export:init_tkinter
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -159,17 +159,17 @@
 
 # Begin Target
 
-# Name "_tkinter - Win32 x86 Release"
-# Name "_tkinter - Win32 x86 Debug"
+# Name "_tkinter - Win32 Release"
+# Name "_tkinter - Win32 Debug"
 # Name "_tkinter - Win32 Alpha Debug"
 # Name "_tkinter - Win32 Alpha Release"
 # Begin Source File
 
 SOURCE=..\Modules\_tkinter.c
 
-!IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
+!IF  "$(CFG)" == "_tkinter - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
 
@@ -182,9 +182,9 @@
 
 SOURCE=..\Modules\tkappinit.c
 
-!IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
+!IF  "$(CFG)" == "_tkinter - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
 
diff --git a/PCbuild/parser.dsp b/PCbuild/parser.dsp
index 7f999dd..be27a6c 100644
--- a/PCbuild/parser.dsp
+++ b/PCbuild/parser.dsp
@@ -18,8 +18,8 @@
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
 !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
 !MESSAGE 
@@ -29,7 +29,7 @@
 # PROP Scc_ProjName "parser"
 # PROP Scc_LocalPath ".."
 
-!IF  "$(CFG)" == "parser - Win32 x86 Release"
+!IF  "$(CFG)" == "parser - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -60,7 +60,7 @@
 # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser.pyd" /libpath:"Release" /export:initparser
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "parser - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -159,17 +159,17 @@
 
 # Begin Target
 
-# Name "parser - Win32 x86 Release"
-# Name "parser - Win32 x86 Debug"
+# Name "parser - Win32 Release"
+# Name "parser - Win32 Debug"
 # Name "parser - Win32 Alpha Debug"
 # Name "parser - Win32 Alpha Release"
 # Begin Source File
 
 SOURCE=..\Modules\parsermodule.c
 
-!IF  "$(CFG)" == "parser - Win32 x86 Release"
+!IF  "$(CFG)" == "parser - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "parser - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"
 
diff --git a/PCbuild/python.dsp b/PCbuild/python.dsp
index d082a12..31209a0 100644
--- a/PCbuild/python.dsp
+++ b/PCbuild/python.dsp
@@ -18,8 +18,8 @@
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
 !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
 !MESSAGE 
@@ -29,7 +29,7 @@
 # PROP Scc_ProjName "python"
 # PROP Scc_LocalPath ".."
 
-!IF  "$(CFG)" == "python - Win32 x86 Release"
+!IF  "$(CFG)" == "python - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -55,7 +55,7 @@
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
 
-!ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -139,8 +139,8 @@
 
 # Begin Target
 
-# Name "python - Win32 x86 Release"
-# Name "python - Win32 x86 Debug"
+# Name "python - Win32 Release"
+# Name "python - Win32 Debug"
 # Name "python - Win32 Alpha Debug"
 # Name "python - Win32 Alpha Release"
 # Begin Source File
@@ -151,9 +151,9 @@
 
 SOURCE=..\Modules\python.c
 
-!IF  "$(CFG)" == "python - Win32 x86 Release"
+!IF  "$(CFG)" == "python - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"
 
diff --git a/PCbuild/python15.dsp b/PCbuild/python15.dsp
index e7e7384..3cb4480 100644
--- a/PCbuild/python15.dsp
+++ b/PCbuild/python15.dsp
@@ -18,8 +18,8 @@
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "python15 - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "python15 - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "python15 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "python15 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "python15 - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
 !MESSAGE "python15 - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
 !MESSAGE 
@@ -29,7 +29,7 @@
 # PROP Scc_ProjName "python15"
 # PROP Scc_LocalPath ".."
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -60,7 +60,7 @@
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib largeint.lib winmm.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /libpath:"Release"
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -159,17 +159,17 @@
 
 # Begin Target
 
-# Name "python15 - Win32 x86 Release"
-# Name "python15 - Win32 x86 Debug"
+# Name "python15 - Win32 Release"
+# Name "python15 - Win32 Debug"
 # Name "python15 - Win32 Alpha Debug"
 # Name "python15 - Win32 Alpha Release"
 # Begin Source File
 
 SOURCE=..\Modules\_localemodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -182,9 +182,9 @@
 
 SOURCE=..\Objects\abstract.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -197,9 +197,9 @@
 
 SOURCE=..\Parser\acceler.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -212,9 +212,9 @@
 
 SOURCE=..\Modules\arraymodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -227,9 +227,9 @@
 
 SOURCE=..\Modules\audioop.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -242,9 +242,9 @@
 
 SOURCE=..\Modules\binascii.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -257,9 +257,9 @@
 
 SOURCE=..\Parser\bitset.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -272,9 +272,9 @@
 
 SOURCE=..\Python\bltinmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -287,9 +287,9 @@
 
 SOURCE=..\Objects\bufferobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -302,9 +302,9 @@
 
 SOURCE=..\Python\ceval.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -317,9 +317,9 @@
 
 SOURCE=..\Objects\classobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -332,9 +332,9 @@
 
 SOURCE=..\Modules\cmathmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -347,9 +347,9 @@
 
 SOURCE=..\Objects\cobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -362,9 +362,9 @@
 
 SOURCE=..\Python\compile.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -377,9 +377,9 @@
 
 SOURCE=..\Objects\complexobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -392,9 +392,9 @@
 
 SOURCE=..\PC\config.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -407,9 +407,9 @@
 
 SOURCE=..\Modules\cPickle.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -422,9 +422,9 @@
 
 SOURCE=..\Modules\cStringIO.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -437,9 +437,9 @@
 
 SOURCE=..\Objects\dictobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -452,9 +452,9 @@
 
 SOURCE=..\PC\dl_nt.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -467,9 +467,9 @@
 
 SOURCE=..\Python\dynload_win.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -482,9 +482,9 @@
 
 SOURCE=..\Modules\errnomodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -497,9 +497,9 @@
 
 SOURCE=..\Python\errors.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -512,9 +512,9 @@
 
 SOURCE=..\Objects\fileobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -527,9 +527,9 @@
 
 SOURCE=..\Objects\floatobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -542,9 +542,9 @@
 
 SOURCE=..\Modules\fpectlmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -557,9 +557,9 @@
 
 SOURCE=..\Modules\fpetestmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -572,9 +572,9 @@
 
 SOURCE=..\Objects\frameobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -587,9 +587,9 @@
 
 SOURCE=..\Python\frozen.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -602,9 +602,9 @@
 
 SOURCE=..\Objects\funcobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -617,9 +617,9 @@
 
 SOURCE=..\Python\getargs.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -632,9 +632,9 @@
 
 SOURCE=..\Modules\getbuildinfo.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -647,9 +647,9 @@
 
 SOURCE=..\Python\getcompiler.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -662,9 +662,9 @@
 
 SOURCE=..\Python\getcopyright.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -677,9 +677,9 @@
 
 SOURCE=..\Python\getmtime.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -692,9 +692,9 @@
 
 SOURCE=..\Python\getopt.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -707,9 +707,9 @@
 
 SOURCE=..\PC\getpathp.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -722,9 +722,9 @@
 
 SOURCE=..\Python\getplatform.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -737,9 +737,9 @@
 
 SOURCE=..\Python\getversion.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -752,9 +752,9 @@
 
 SOURCE=..\Python\graminit.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -767,9 +767,9 @@
 
 SOURCE=..\Parser\grammar1.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -782,9 +782,9 @@
 
 SOURCE=..\Modules\imageop.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -797,9 +797,9 @@
 
 SOURCE=..\Python\import.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -812,11 +812,11 @@
 
 SOURCE=..\PC\import_nt.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
 # ADD CPP /I "..\Python"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 # ADD CPP /I "..\Python"
 
@@ -837,9 +837,9 @@
 
 SOURCE=..\Python\importdl.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -852,9 +852,9 @@
 
 SOURCE=..\Objects\intobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -867,9 +867,9 @@
 
 SOURCE=..\Parser\listnode.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -882,9 +882,9 @@
 
 SOURCE=..\Objects\listobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -897,9 +897,9 @@
 
 SOURCE=..\Objects\longobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -912,9 +912,9 @@
 
 SOURCE=..\Modules\main.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -927,9 +927,9 @@
 
 SOURCE=..\Python\marshal.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -942,9 +942,9 @@
 
 SOURCE=..\Modules\mathmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -957,9 +957,9 @@
 
 SOURCE=..\Modules\md5c.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -972,9 +972,9 @@
 
 SOURCE=..\Modules\md5module.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -987,9 +987,9 @@
 
 SOURCE=..\Parser\metagrammar.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1002,9 +1002,9 @@
 
 SOURCE=..\Objects\methodobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1017,9 +1017,9 @@
 
 SOURCE=..\Python\modsupport.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1032,9 +1032,9 @@
 
 SOURCE=..\Objects\moduleobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1047,9 +1047,9 @@
 
 SOURCE=..\PC\msvcrtmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1062,9 +1062,9 @@
 
 SOURCE=..\Parser\myreadline.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1077,9 +1077,9 @@
 
 SOURCE=..\Python\mystrtoul.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1092,9 +1092,9 @@
 
 SOURCE=..\Modules\newmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1107,9 +1107,9 @@
 
 SOURCE=..\Parser\node.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1122,9 +1122,9 @@
 
 SOURCE=..\Objects\object.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1137,9 +1137,9 @@
 
 SOURCE=..\Modules\operator.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1152,9 +1152,9 @@
 
 SOURCE=..\Parser\parser.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1167,9 +1167,9 @@
 
 SOURCE=..\Parser\parsetok.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1182,9 +1182,9 @@
 
 SOURCE=..\Modules\pcremodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1197,9 +1197,9 @@
 
 SOURCE=..\Modules\posixmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1212,9 +1212,9 @@
 
 SOURCE=..\Python\pyfpe.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1227,9 +1227,9 @@
 
 SOURCE=..\Modules\pypcre.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1242,9 +1242,9 @@
 
 SOURCE=..\Python\pystate.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1261,9 +1261,9 @@
 
 SOURCE=..\Python\pythonrun.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1276,9 +1276,9 @@
 
 SOURCE=..\Objects\rangeobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1291,9 +1291,9 @@
 
 SOURCE=..\Modules\regexmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1306,9 +1306,9 @@
 
 SOURCE=..\Modules\regexpr.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1321,9 +1321,9 @@
 
 SOURCE=..\Modules\rgbimgmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1336,9 +1336,9 @@
 
 SOURCE=..\Modules\rotormodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1351,9 +1351,9 @@
 
 SOURCE=..\Modules\selectmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1366,9 +1366,9 @@
 
 SOURCE=..\Modules\shamodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1381,9 +1381,9 @@
 
 SOURCE=..\Modules\signalmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1396,9 +1396,9 @@
 
 SOURCE=..\Objects\sliceobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1411,9 +1411,9 @@
 
 SOURCE=..\Modules\socketmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1426,9 +1426,9 @@
 
 SOURCE=..\Modules\soundex.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1441,9 +1441,9 @@
 
 SOURCE=..\Objects\stringobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1456,9 +1456,9 @@
 
 SOURCE=..\Modules\stropmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1471,9 +1471,9 @@
 
 SOURCE=..\Python\structmember.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1486,9 +1486,9 @@
 
 SOURCE=..\Modules\structmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1501,9 +1501,9 @@
 
 SOURCE=..\Python\sysmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1516,9 +1516,9 @@
 
 SOURCE=..\Python\thread.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1531,9 +1531,9 @@
 
 SOURCE=..\Modules\threadmodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1546,9 +1546,9 @@
 
 SOURCE=..\Modules\timemodule.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1561,9 +1561,9 @@
 
 SOURCE=..\Parser\tokenizer.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1576,9 +1576,9 @@
 
 SOURCE=..\Python\traceback.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1591,9 +1591,9 @@
 
 SOURCE=..\Objects\tupleobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1606,9 +1606,9 @@
 
 SOURCE=..\Objects\typeobject.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1621,9 +1621,9 @@
 
 SOURCE=..\PC\winsound.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
@@ -1636,9 +1636,9 @@
 
 SOURCE=..\Modules\yuvconvert.c
 
-!IF  "$(CFG)" == "python15 - Win32 x86 Release"
+!IF  "$(CFG)" == "python15 - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
 
diff --git a/PCbuild/pythonw.dsp b/PCbuild/pythonw.dsp
index e771c85..d9688ae 100644
--- a/PCbuild/pythonw.dsp
+++ b/PCbuild/pythonw.dsp
@@ -18,8 +18,8 @@
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application")
-!MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
 !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
 !MESSAGE 
@@ -29,7 +29,7 @@
 # PROP Scc_ProjName "pythonw"
 # PROP Scc_LocalPath "..\pc"
 
-!IF  "$(CFG)" == "pythonw - Win32 x86 Release"
+!IF  "$(CFG)" == "pythonw - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -59,7 +59,7 @@
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /libpath:"Release"
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -157,8 +157,8 @@
 
 # Begin Target
 
-# Name "pythonw - Win32 x86 Release"
-# Name "pythonw - Win32 x86 Debug"
+# Name "pythonw - Win32 Release"
+# Name "pythonw - Win32 Debug"
 # Name "pythonw - Win32 Alpha Debug"
 # Name "pythonw - Win32 Alpha Release"
 # Begin Source File
@@ -169,9 +169,9 @@
 
 SOURCE=..\PC\WinMain.c
 
-!IF  "$(CFG)" == "pythonw - Win32 x86 Release"
+!IF  "$(CFG)" == "pythonw - Win32 Release"
 
-!ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
 
 !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"
 
diff --git a/PCbuild/zlib.dsp b/PCbuild/zlib.dsp
index 3d4aeb6..b3dd71a 100644
--- a/PCbuild/zlib.dsp
+++ b/PCbuild/zlib.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=zlib - Win32 x86 Debug
+CFG=zlib - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,12 @@
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"
+!MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "zlib - Win32 x86 Release"
+!IF  "$(CFG)" == "zlib - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -57,7 +57,7 @@
 # ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /libpath:"Release" /export:initzlib
 # SUBTRACT LINK32 /pdb:none
 
-!ELSEIF  "$(CFG)" == "zlib - Win32 x86 Debug"
+!ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -89,8 +89,8 @@
 
 # Begin Target
 
-# Name "zlib - Win32 x86 Release"
-# Name "zlib - Win32 x86 Debug"
+# Name "zlib - Win32 Release"
+# Name "zlib - Win32 Debug"
 # Begin Source File
 
 SOURCE=..\Modules\zlibmodule.c