diff --git a/src/mainboard/lenovo/t410/acpi/dock.asl b/src/mainboard/lenovo/t410/acpi/dock.asl
index 4771c5197e..a94762f83f 100644
--- a/src/mainboard/lenovo/t410/acpi/dock.asl
+++ b/src/mainboard/lenovo/t410/acpi/dock.asl
@@ -12,18 +12,18 @@ Scope (\_SB)
 		{
 			if (Arg0) {
 			   /* connect dock */
-			   Store (1, \GP28)
-			   Store (1, \_SB.PCI0.LPCB.EC.DKR1)
-			   Store (1, \_SB.PCI0.LPCB.EC.DKR2)
-			   Store (1, \_SB.PCI0.LPCB.EC.DKR3)
+			   \GP28 = 1
+			   \_SB.PCI0.LPCB.EC.DKR1 = 1
+			   \_SB.PCI0.LPCB.EC.DKR2 = 1
+			   \_SB.PCI0.LPCB.EC.DKR3 = 1
 			} else {
 			   /* disconnect dock */
-			   Store (0, \GP28)
-			   Store (0, \_SB.PCI0.LPCB.EC.DKR1)
-			   Store (0, \_SB.PCI0.LPCB.EC.DKR2)
-			   Store (0, \_SB.PCI0.LPCB.EC.DKR3)
+			   \GP28 = 0
+			   \_SB.PCI0.LPCB.EC.DKR1 = 0
+			   \_SB.PCI0.LPCB.EC.DKR2 = 0
+			   \_SB.PCI0.LPCB.EC.DKR3 = 0
 			}
-			Xor(Arg0, \_SB.PCI0.LPCB.EC.DKR1, Local0)
+			Local0 = Arg0 ^ \_SB.PCI0.LPCB.EC.DKR1
 			Return (Local0)
 		}
 
diff --git a/src/mainboard/lenovo/t410/acpi/gpe.asl b/src/mainboard/lenovo/t410/acpi/gpe.asl
index 62e7b37bb4..9984636860 100644
--- a/src/mainboard/lenovo/t410/acpi/gpe.asl
+++ b/src/mainboard/lenovo/t410/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++
 	}
 }