Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rda3fb953ff72fc65fc6c8c6b91fd833114cb7cbf -r594e11a544c7d3f97f057a2d4c146f464e437948
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision da3fb953ff72fc65fc6c8c6b91fd833114cb7cbf)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 594e11a544c7d3f97f057a2d4c146f464e437948)
@@ -274,10 +274,8 @@
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_CHECK_INLET_WATER;
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
-    BOOL isInletWaterReady = isWaterQualityGood();
-
 #ifndef DISABLE_DIALYSATE_CHECK
-    if ( isInletWaterReady )
+    if ( TRUE == isWaterQualityGood() )
 #endif
     {
         reservoirBaseWeight = getReservoirWeight( inactiveReservoir );
@@ -422,7 +420,7 @@
         }
 
         // if we've reached our target fill to volume (by weight), we're done filling - go back to re-circ mode
-        if ( hasTargetFillVolumeBeenReached( inactiveReservoir ) )
+        if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
         {
             F32 const filledVolume_mL = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
             F32 const integratedVolume_mL = totalROFlowRate_LPM * RO_FLOW_INTEGRATOR * ACID_BICARB_CONCENTRATE_ADDITION_MULTIPLER;