diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index e50d2d6..1c16156 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -21,7 +21,7 @@
     asmLeadingUnderscore(false), asmAlignmentIsInBytes(false),
     asmPrintDotLocalConstants(false), asmPrintDotLCommConstants(false),
     asmPrintConstantAlignment(false) {
-  // Declare a boolean for each platform
+  // Declare a boolean for each major platform.
   bool forCygwin = false;
   bool forDarwin = false;
   bool forWindows = false;
@@ -40,20 +40,18 @@
 #elif defined(__APPLE__)
     forDarwin = true;
 #elif defined(_WIN32)
-    forWindws = true;
+    forWindows = true;
 #endif
   }
 
   if (forCygwin) {
     asmLeadingUnderscore = true;
-  }
-  if (forDarwin) {
+  } else if (forDarwin) {
     stackAlignment = 16;
     indirectExternAndWeakGlobals = true;
     asmDarwinLinkerStubs = true;
     asmLeadingUnderscore = true;
     asmPrintDotLCommConstants = true;
-  }
-  if (forWindows) {
+  } else if (forWindows) {
   }
 }
diff --git a/lib/Target/X86/X86Subtarget.h b/lib/Target/X86/X86Subtarget.h
index 96a1bb2..a67925e 100644
--- a/lib/Target/X86/X86Subtarget.h
+++ b/lib/Target/X86/X86Subtarget.h
@@ -21,7 +21,8 @@
 
 class X86Subtarget : public TargetSubtarget {
 protected:
-  /// Used by the target machine to set up the target frame info
+  /// stackAlignment - The minimum alignment known to hold of the stack frame on
+  /// entry to the function and which must be maintained by every function.
   unsigned stackAlignment;
   
   /// Used by instruction selector
@@ -39,16 +40,18 @@
   /// of the specified module.
   ///
   X86Subtarget(const Module &M);
-  
-  /// Returns the preferred stack alignment for the current target triple, or
-  /// the default if no target triple is set.
+
+  /// getStackAlignment - Returns the minimum alignment known to hold of the
+  /// stack frame on entry to the function and which must be maintained by every
+  /// function for this subtarget.
   unsigned getStackAlignment() const { return stackAlignment; }
   
   /// Returns true if the instruction selector should treat global values
   /// referencing external or weak symbols as indirect rather than direct 
   /// references.
-  bool getIndirectExternAndWeakGlobals() const { 
-    return indirectExternAndWeakGlobals; }
+  bool getIndirectExternAndWeakGlobals() const {
+    return indirectExternAndWeakGlobals;
+  }
 };
 } // End llvm namespace