Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r915d478dd9485e5475ba3ddd842f227009bc46a8 -rfff308d96794e7df7e91149173c3760ff3fda10c
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 915d478dd9485e5475ba3ddd842f227009bc46a8)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision fff308d96794e7df7e91149173c3760ff3fda10c)
@@ -318,26 +318,10 @@
         F32 artLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT );
         F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
 
-        if ( artPres < artLowLimit )
-        {
 #ifndef DISABLE_PRESSURE_CHECKS
-            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, TRUE, artPres, artLowLimit );
+        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit, artPres, artLowLimit );
+        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit, artPres, artHighLimit );
 #endif
-        }
-        else
-        {
-            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, FALSE, artPres, artLowLimit );
-        }
-        if ( artPres > artHighLimit )
-        {
-#ifndef DISABLE_PRESSURE_CHECKS
-            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, TRUE, artPres, artHighLimit );
-#endif
-        }
-        else
-        {
-            checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, FALSE, artPres, artHighLimit );
-        }
     }
 }
 
@@ -359,26 +343,10 @@
         F32 venLowLimit  = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_LOW_LIMIT );
         F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
 
-        if ( venPres < venLowLimit )
-        {
 #ifndef DISABLE_PRESSURE_CHECKS
-            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, TRUE, venPres, venLowLimit );
+        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, venPres < venLowLimit, venPres, venLowLimit );
+        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, venPres > venHighLimit, venPres, venHighLimit );
 #endif
-        }
-        else
-        {
-            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, FALSE, venPres, venLowLimit );
-        }
-        if ( venPres > venHighLimit )
-        {
-#ifndef DISABLE_PRESSURE_CHECKS
-            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, TRUE, venPres, venHighLimit );
-#endif
-        }
-        else
-        {
-            checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, FALSE, venPres, venHighLimit );
-        }
     }
 }
 
@@ -526,7 +494,7 @@
 {
     U32 result = dialOutPumpOcclusion.data;
 
-    if ( 0xCCC33C33 == dialOutPumpOcclusion.override )
+    if ( OVERRIDE_KEY == dialOutPumpOcclusion.override )
     {
         result = dialOutPumpOcclusion.ovData;
     }