diff --git a/src/cas/generic/st/casDGIntfOS.cc b/src/cas/generic/st/casDGIntfOS.cc
index e61e54e77..d4c987a75 100644
--- a/src/cas/generic/st/casDGIntfOS.cc
+++ b/src/cas/generic/st/casDGIntfOS.cc
@@ -224,24 +224,22 @@ void casDGIOWakeup::show(unsigned level) const
 //
 inline void casDGIntfOS::armRecv()
 {
-	if (!this->pRdReg) {
-		if (this->inBuf::full()!=aitTrue) {
+	if (!this->inBuf::full()) {
+	    if (!this->pRdReg) {
 			this->pRdReg = new casDGReadReg(*this);
 			if (!this->pRdReg) {
 				errMessage (S_cas_noMemory, "armRecv()");
                 throw S_cas_noMemory;
 			}
 		}
-	}
-	if (this->validBCastFD() && this->pBCastRdReg==NULL) {
-		if (this->inBuf::full()!=aitTrue) {
+	    if (this->validBCastFD() && this->pBCastRdReg==NULL) {
 			this->pBCastRdReg = new casDGBCastReadReg(*this);
 			if (!this->pBCastRdReg) {
 				errMessage (S_cas_noMemory, "armRecv()");
                 throw S_cas_noMemory;
 			}
-		}
-	}
+	    }
+    }
 }
 
 //
@@ -492,8 +490,6 @@ void casDGIntfOS::sendCB()
 //
 void casDGIntfOS::recvCB (inBuf::fillParameter parm)
 {	
-    caNetAddr from;
-
 	assert (this->pRdReg);
 
     //
@@ -512,7 +508,7 @@ void casDGIntfOS::recvCB (inBuf::fillParameter parm)
 	// (casDGReadReg is _not_ a onceOnly fdReg - 
 	// therefore an explicit delete is required here)
 	//
-	if (this->inBuf::full()==aitTrue) {
+	if (this->inBuf::full()) {
 		this->disarmRecv(); // this deletes the casDGReadReg object
 	}
 }
diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc
index b22517a3f..6ce482c27 100644
--- a/src/cas/generic/st/casStreamOS.cc
+++ b/src/cas/generic/st/casStreamOS.cc
@@ -229,7 +229,7 @@ void casStreamIOWakeup::show(unsigned level) const
 inline void casStreamOS::armRecv()
 {
 	if (!this->pRdReg) {
-		if (this->inBuf::full()!=aitTrue) {
+		if (!this->inBuf::full()) {
 			this->pRdReg = new casStreamReadReg(*this);
 			if (!this->pRdReg) {
 				errMessage(S_cas_noMemory, "armRecv()");
@@ -444,7 +444,7 @@ void casStreamOS::recvCB()
 	    if (procCond == casProcDisconnect) {
 		    delete this;
 	    }	
-	    else if (this->inBuf::full()==aitTrue) {
+	    else if (this->inBuf::full()) {
 		    //
 		    // If there isnt any space then temporarily 
 		    // stop calling this routine until problem is resolved