diff --git a/src/mainboard/lenovo/x60/acpi/dock.asl b/src/mainboard/lenovo/x60/acpi/dock.asl
index 26f555f434..5fd69781fb 100644
--- a/src/mainboard/lenovo/x60/acpi/dock.asl
+++ b/src/mainboard/lenovo/x60/acpi/dock.asl
@@ -27,7 +27,7 @@ Scope (\_SB)
 			   TRAP(SMI_DOCK_DISCONNECT)
 			}
 
-			Xor(Arg0, DSTA, Local0)
+			Local0 = Arg0 ^ DSTA
 			Return (Local0)
 		}
 
diff --git a/src/mainboard/lenovo/x60/acpi/gpe.asl b/src/mainboard/lenovo/x60/acpi/gpe.asl
index 62e7b37bb4..9984636860 100644
--- a/src/mainboard/lenovo/x60/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x60/acpi/gpe.asl
@@ -5,8 +5,8 @@ Scope (\_GPE)
 	Method(_L18, 0, NotSerialized)
 	{
 		/* Read EC register to clear wake status */
-		Store(\_SB.PCI0.LPCB.EC.WAKE, Local0)
+		Local0 = \_SB.PCI0.LPCB.EC.WAKE
 		/* So that we don't get a warning that Local0 is unused. */
-		Increment (Local0)
+		Local0++
 	}
 }
diff --git a/src/mainboard/lenovo/x60/acpi/platform.asl b/src/mainboard/lenovo/x60/acpi/platform.asl
index 2e3bfc06c8..50da033b2d 100644
--- a/src/mainboard/lenovo/x60/acpi/platform.asl
+++ b/src/mainboard/lenovo/x60/acpi/platform.asl
@@ -24,12 +24,12 @@ Method(_WAK,1)
 	// was inserted while a sleep state was active.
 
 	// Are we going to S3?
-	If (LEqual(Arg0, 3)) {
+	If (Arg0 == 3) {
 		// ..
 	}
 
 	// Are we going to S4?
-	If (LEqual(Arg0, 4)) {
+	If (Arg0 == 4) {
 		// ..
 	}