diff --git a/src/cas/example/directoryService/main.cc b/src/cas/example/directoryService/main.cc
index f8688b5b6..af6ec98c9 100644
--- a/src/cas/example/directoryService/main.cc
+++ b/src/cas/example/directoryService/main.cc
@@ -40,7 +40,7 @@ extern int main (int argc, const char **argv)
 			continue;
 		}
 		if (sscanf(argv[i],"-t %lf", &executionTime)==1) {
-			forever = aitFalse;
+			forever = false;
 			continue;
 		}
 		if (sscanf(argv[i],"-p %127s", pvPrefix)==1) {
@@ -78,7 +78,7 @@ extern int main (int argc, const char **argv)
 		//
 		// loop here forever
 		//
-		while (aitTrue) {
+		while (true) {
 			fileDescriptorManager.process (1000.0);
 		}
 	}
diff --git a/src/cas/example/simple/exPV.cc b/src/cas/example/simple/exPV.cc
index b3ce6d824..fc9a797c3 100644
--- a/src/cas/example/simple/exPV.cc
+++ b/src/cas/example/simple/exPV.cc
@@ -23,7 +23,7 @@ class exFixedStringDestructor: public gddDestructor {
 //
 exPV::exPV (pvInfo &setup, bool preCreateFlag, bool scanOnIn) : 
 	info (setup),
-	interest (aitFalse),
+	interest (false),
 	preCreate (preCreateFlag),
 	scanOn (scanOnIn)
 {
@@ -94,7 +94,7 @@ caStatus exPV::update(gdd &valueIn)
 	//
 	// post a value change event
 	//
-	if (this->interest==aitTrue && pCAS!=NULL) {
+	if (this->interest==true && pCAS!=NULL) {
 		casEventMask select(pCAS->valueEventMask()|pCAS->logEventMask());
 		this->postEvent (select, *this->pValue);
 	}
@@ -161,7 +161,7 @@ caStatus exPV::interestRegister()
 		return S_casApp_success;
 	}
 
-	this->interest = aitTrue;
+	this->interest = true;
 
 	if (!this->scanOn) {
 		return S_casApp_success;
@@ -193,7 +193,7 @@ caStatus exPV::interestRegister()
 //
 void exPV::interestDelete()
 {
-	this->interest = aitFalse;
+	this->interest = false;
 	if (this->pScanTimer && this->scanOn) {
 		this->pScanTimer->reschedule(this->getScanPeriod());
 	}
@@ -293,7 +293,7 @@ caStatus exPV::getUnits(gdd &units)
 //
 caStatus exPV::getEnums (gdd &enums)
 {
-	unsigned nStr = 2;
+	static const unsigned nStr = 2;
 	aitFixedString *str;
 	exFixedStringDestructor *pDes;
 
diff --git a/src/cas/example/simple/exServer.cc b/src/cas/example/simple/exServer.cc
index c4c6b9702..5b57b389d 100644
--- a/src/cas/example/simple/exServer.cc
+++ b/src/cas/example/simple/exServer.cc
@@ -67,7 +67,7 @@ exServer::exServer(const char * const pvPrefix, unsigned aliasCount, bool scanOn
 	// pre-create all of the simple PVs that this server will export
 	//
 	for (pPVI = exServer::pvList; pPVI < pPVAfter; pPVI++) {
-		pPV = pPVI->createPV (*this, aitTrue, scanOnIn);
+		pPV = pPVI->createPV (*this, true, scanOnIn);
 		if (!pPV) {
 			fprintf(stderr, "Unable to create new PV \"%s\"\n",
 				pPVI->getName());
@@ -210,7 +210,7 @@ pvAttachReturn exServer::pvAttach
 	// If this is a synchronous PV create the PV now 
 	//
 	if (pvi.getIOType() == excasIoSync) {
-		pPV = pvi.createPV(*this, aitFalse, this->scanOn);
+		pPV = pvi.createPV(*this, false, this->scanOn);
 		if (pPV) {
 			return *pPV;
 		}
@@ -348,7 +348,7 @@ void exAsyncCreateIO::expire()
 {
 	exPV *pPV;
 
-	pPV = this->pvi.createPV(this->cas, aitFalse, this->scanOn);
+	pPV = this->pvi.createPV(this->cas, false, this->scanOn);
 	if (pPV) {
 		this->postIOCompletion (pvAttachReturn(*pPV));
 	}
diff --git a/src/cas/example/simple/main.cc b/src/cas/example/simple/main.cc
index dbc29f689..07ab5e987 100644
--- a/src/cas/example/simple/main.cc
+++ b/src/cas/example/simple/main.cc
@@ -16,7 +16,7 @@ extern int main (int argc, const char **argv)
 	unsigned    aliasCount = 1u;
 	unsigned    scanOnAsUnsignedInt = true;
     bool        scanOn;
-	bool        forever = aitTrue;
+	bool        forever = true;
 	int         i;
 
 	for (i=1; i<argc; i++) {
@@ -24,7 +24,7 @@ extern int main (int argc, const char **argv)
 			continue;
 		}
 		if (sscanf(argv[i],"-t %lf", &executionTime)==1) {
-			forever = aitFalse;
+			forever = false;
 			continue;
 		}
 		if (sscanf(argv[i],"-p %127s", pvPrefix)==1) {
@@ -62,7 +62,7 @@ extern int main (int argc, const char **argv)
 		//
 		// loop here forever
 		//
-		while (aitTrue) {
+		while (true) {
 			fileDescriptorManager.process(1000.0);
 		}
 	}