diff --git a/src/apps/deskbar/BarView.cpp b/src/apps/deskbar/BarView.cpp
index 67ef95f309..683004398d 100644
--- a/src/apps/deskbar/BarView.cpp
+++ b/src/apps/deskbar/BarView.cpp
@@ -663,12 +663,13 @@ TBarView::ChangeState(int32 state, bool vertical, bool left, bool top,
 void
 TBarView::SaveExpandedItems()
 {
-	if (fExpandoMenuBar == NULL || fExpandoMenuBar->CountItems() <= 0)
+	if (fExpandoMenuBar == NULL)
 		return;
 
 	// Get a list of the signatures of expanded apps. Can't use
 	// team_id because there can be more than one team per application
-	for (int32 i = 0; i < fExpandoMenuBar->CountItems(); i++) {
+	int32 count = fExpandoMenuBar->CountItems();
+	for (int32 i = 0; i < count; i++) {
 		TTeamMenuItem* teamItem
 			= dynamic_cast<TTeamMenuItem*>(fExpandoMenuBar->ItemAt(i));
 
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp
index 46d0c601ad..362ce4bcef 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -731,7 +731,7 @@ TExpandoMenuBar::RemoveTeam(team_id team, bool partial)
 {
 	TWindowMenuItem* windowItem = NULL;
 
-	for (int32 i = 0; i < CountItems(); i++) {
+	for (int32 i = CountItems() - 1; i >= 0; i--) {
 		if (TTeamMenuItem* item = dynamic_cast<TTeamMenuItem*>(ItemAt(i))) {
 			if (item->Teams()->HasItem((void*)(addr_t)team)) {
 				item->Teams()->RemoveItem(team);
diff --git a/src/apps/deskbar/ResourceSet.cpp b/src/apps/deskbar/ResourceSet.cpp
index 17469b26eb..f80f082cca 100644
--- a/src/apps/deskbar/ResourceSet.cpp
+++ b/src/apps/deskbar/ResourceSet.cpp
@@ -253,7 +253,7 @@ namespace TResourcePrivate {
 
 		TypeItem* FindItemByID(int32 id)
 		{
-			for (int32 i = 0; i < fItems.CountItems(); i++ ) {
+			for (int32 i = fItems.CountItems() - 1; i >= 0; i--) {
 				TypeItem* it = (TypeItem*)fItems.ItemAt(i);
 				if (it->ID() == id)
 					return it;
@@ -263,7 +263,7 @@ namespace TResourcePrivate {
 
 		TypeItem* FindItemByName(const char* name)
 		{
-			for (int32 i = 0; i < fItems.CountItems(); i++ ) {
+			for (int32 i = fItems.CountItems() - 1; i >= 0; i--) {
 				TypeItem* it = (TypeItem*)fItems.ItemAt(i);
 				if (strcmp(it->Name(), name) == 0)
 					return it;
@@ -677,8 +677,7 @@ TResourceSet::FindTypeList(type_code type)
 {
 	BAutolock lock(&fLock);
 
-	int32 count = fTypes.CountItems();
-	for (int32 i = 0; i < count; i++ ) {
+	for (int32 i = fTypes.CountItems() - 1; i >= 0; i--) {
 		TypeList* list = (TypeList*)fTypes.ItemAt(i);
 		if (list && list->Type() == type)
 			return list;
@@ -731,8 +730,7 @@ TResourceSet::LoadResource(type_code type, int32 id, const char* name,
 
 		// If a named resource, first look in directories.
 		fLock.Lock();
-		int32 count = fDirectories.CountItems();
-		for (int32 i = 0; item == 0 && i < count; i++) {
+		for (int32 i = fDirectories.CountItems() - 1; i >= 0; i--) {
 			BPath* dir = (BPath*)fDirectories.ItemAt(i);
 			if (dir) {
 				fLock.Unlock();
@@ -754,8 +752,7 @@ TResourceSet::LoadResource(type_code type, int32 id, const char* name,
 	if (!item) {
 		// Look through resource objects for data.
 		fLock.Lock();
-		int32 count = fResources.CountItems();
-		for (int32 i = 0; item == 0 && i < count; i++ ) {
+		for (int32 i = fResources.CountItems() - 1; i >= 0; i--) {
 			BResources* resource = (BResources*)fResources.ItemAt(i);
 			if (resource) {
 				const void* data = NULL;
diff --git a/src/apps/deskbar/ShowHideMenuItem.cpp b/src/apps/deskbar/ShowHideMenuItem.cpp
index e195eb7625..4a34af94a8 100644
--- a/src/apps/deskbar/ShowHideMenuItem.cpp
+++ b/src/apps/deskbar/ShowHideMenuItem.cpp
@@ -113,32 +113,31 @@ TShowHideMenuItem::TeamShowHideCommon(int32 action, const BList* teamList,
 	if (teamList == NULL)
 		return B_BAD_VALUE;
 
-	int32 count = teamList->CountItems();
-	for (int32 index = 0; index < count; index++) {
-		team_id team = (addr_t)teamList->ItemAt(index);
+	for (int32 i = teamList->CountItems() - 1; i >= 0; i--) {
+		team_id team = (addr_t)teamList->ItemAt(i);
 
 		switch (action) {
 			case B_MINIMIZE_WINDOW:
-				do_minimize_team(zoomRect, team, doZoom && index == 0);
+				do_minimize_team(zoomRect, team, doZoom && i == 0);
 				break;
 
 			case B_BRING_TO_FRONT:
-				do_bring_to_front_team(zoomRect, team, doZoom && index == 0);
+				do_bring_to_front_team(zoomRect, team, doZoom && i == 0);
 				break;
 
 			case B_QUIT_REQUESTED:
-				{
-					BMessenger messenger((char*)NULL, team);
-					uint32 command = B_QUIT_REQUESTED;
-					app_info aInfo;
-					be_roster->GetRunningAppInfo(team, &aInfo);
+			{
+				BMessenger messenger((char*)NULL, team);
+				uint32 command = B_QUIT_REQUESTED;
+				app_info aInfo;
+				be_roster->GetRunningAppInfo(team, &aInfo);
 
-					if (strcasecmp(aInfo.signature, kTrackerSignature) == 0)
-						command = 'Tall';
+				if (strcasecmp(aInfo.signature, kTrackerSignature) == 0)
+					command = 'Tall';
 
-					messenger.SendMessage(command);
-					break;
-				}
+				messenger.SendMessage(command);
+				break;
+			}
 		}
 	}
 
diff --git a/src/apps/deskbar/StatusView.cpp b/src/apps/deskbar/StatusView.cpp
index b25c7af420..5cf934b517 100644
--- a/src/apps/deskbar/StatusView.cpp
+++ b/src/apps/deskbar/StatusView.cpp
@@ -500,7 +500,7 @@ TReplicantTray::DeleteAddOnSupport()
 {
 	_SaveSettings();
 
-	for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
+	for (int32 i = fItemList->CountItems() - 1; i >= 0; i--) {
 		DeskbarItemInfo* item = (DeskbarItemInfo*)fItemList->RemoveItem(i);
 		if (item) {
 			if (item->isAddOn)
@@ -519,7 +519,7 @@ TReplicantTray::DeleteAddOnSupport()
 DeskbarItemInfo*
 TReplicantTray::DeskbarItemFor(node_ref& nodeRef)
 {
-	for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
+	for (int32 i = fItemList->CountItems() - 1; i >= 0; i--) {
 		DeskbarItemInfo* item = (DeskbarItemInfo*)fItemList->ItemAt(i);
 		if (item == NULL)
 			continue;
@@ -535,7 +535,7 @@ TReplicantTray::DeskbarItemFor(node_ref& nodeRef)
 DeskbarItemInfo*
 TReplicantTray::DeskbarItemFor(int32 id)
 {
-	for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
+	for (int32 i = fItemList->CountItems() - 1; i >= 0; i--) {
 		DeskbarItemInfo* item = (DeskbarItemInfo*)fItemList->ItemAt(i);
 		if (item == NULL)
 			continue;
@@ -719,7 +719,7 @@ void
 TReplicantTray::UnloadAddOn(node_ref* nodeRef, dev_t* device,
 	bool which, bool removeAll)
 {
-	for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
+	for (int32 i = fItemList->CountItems() - 1; i >= 0; i--) {
 		DeskbarItemInfo* item = (DeskbarItemInfo*)fItemList->ItemAt(i);
 		if (!item)
 			continue;
@@ -783,7 +783,7 @@ TReplicantTray::MoveItem(entry_ref* ref, ino_t toDirectory)
 	//
 	// don't need to change node info as it does not change
 
-	for (int32 i = fItemList->CountItems(); i-- > 0 ;) {
+	for (int32 i = fItemList->CountItems() - 1; i >= 0; i--) {
 		DeskbarItemInfo* item = (DeskbarItemInfo*)fItemList->ItemAt(i);
 		if (!item)
 			continue;
diff --git a/src/apps/deskbar/Switcher.cpp b/src/apps/deskbar/Switcher.cpp
index 59963f66d1..b4917a5377 100644
--- a/src/apps/deskbar/Switcher.cpp
+++ b/src/apps/deskbar/Switcher.cpp
@@ -466,7 +466,7 @@ TSwitchManager::TSwitchManager(BPoint point)
 
 TSwitchManager::~TSwitchManager()
 {
-	for (int32 i = fGroupList.CountItems(); i-- > 0;) {
+	for (int32 i = fGroupList.CountItems() - 1; i >= 0; i--) {
 		TTeamGroup* teamInfo = static_cast<TTeamGroup*>(fGroupList.ItemAt(i));
 		delete teamInfo;
 	}
@@ -551,8 +551,9 @@ TSwitchManager::MessageReceived(BMessage* message)
 		{
 			const char* signature = message->FindString("sig");
 			team_id team = message->FindInt32("team");
+			int32 count = fGroupList.CountItems();
 
-			for (int32 i = 0; i < fGroupList.CountItems(); i++) {
+			for (int32 i = 0; i < count; i++) {
 				TTeamGroup* tinfo = (TTeamGroup*)fGroupList.ItemAt(i);
 				if (strcasecmp(tinfo->Signature(), signature) == 0) {
 					if (!(tinfo->TeamList()->HasItem((void*)(addr_t)team)))
@@ -566,8 +567,9 @@ TSwitchManager::MessageReceived(BMessage* message)
 		case kRemoveTeam:
 		{
 			team_id team = message->FindInt32("team");
+			int32 count = fGroupList.CountItems();
 
-			for (int32 i = 0; i < fGroupList.CountItems(); i++) {
+			for (int32 i = 0; i < count; i++) {
 				TTeamGroup* tinfo = (TTeamGroup*)fGroupList.ItemAt(i);
 				if (tinfo->TeamList()->HasItem((void*)(addr_t)team)) {
 					tinfo->TeamList()->RemoveItem((void*)(addr_t)team);
@@ -813,14 +815,15 @@ int32
 TSwitchManager::CountVisibleGroups()
 {
 	int32 result = 0;
-
 	int32 count = fGroupList.CountItems();
+
 	for (int32 i = 0; i < count; i++) {
 		if (!OKToUse((TTeamGroup*)fGroupList.ItemAt(i)))
 			continue;
 
 		result++;
 	}
+
 	return result;
 }
 
@@ -1047,7 +1050,8 @@ TSwitchManager::QuitApp()
 	TTeamGroup* teamGroup;
 	int32 count = 0;
 
-	for (int32 i = fCurrentIndex + 1; i < fGroupList.CountItems(); i++) {
+	int32 groupCount = fGroupList.CountItems();
+	for (int32 i = fCurrentIndex + 1; i < groupCount; i++) {
 		teamGroup = (TTeamGroup*)fGroupList.ItemAt(i);
 
 		if (!OKToUse(teamGroup))
@@ -1067,7 +1071,7 @@ TSwitchManager::QuitApp()
 
 	// send the quit request to all teams in this group
 
-	for (int32 i = teamGroup->TeamList()->CountItems(); i-- > 0;) {
+	for (int32 i = teamGroup->TeamList()->CountItems() - 1; i >= 0; i--) {
 		team_id team = (addr_t)teamGroup->TeamList()->ItemAt(i);
 		app_info info;
 		if (be_roster->GetRunningAppInfo(team, &info) == B_OK) {
@@ -1090,7 +1094,7 @@ TSwitchManager::HideApp()
 
 	TTeamGroup* teamGroup = (TTeamGroup*)fGroupList.ItemAt(fCurrentIndex);
 
-	for (int32 i = teamGroup->TeamList()->CountItems(); i-- > 0;) {
+	for (int32 i = teamGroup->TeamList()->CountItems() - 1; i >= 0; i--) {
 		team_id team = (addr_t)teamGroup->TeamList()->ItemAt(i);
 		app_info info;
 		if (be_roster->GetRunningAppInfo(team, &info) == B_OK)