diff --git a/VistaCommon.cmake b/VistaCommon.cmake
index 048af65a44182b06c5eaf58e5a8e84e1f537e6d5..3f0ce985d10724df820e2fe0dbbcabf7ec4631ab 100644
--- a/VistaCommon.cmake
+++ b/VistaCommon.cmake
@@ -1064,22 +1064,22 @@ macro( vista_configure_app _PACKAGE_NAME )
 			set( _ENTRIES "" )
 			if( _DYNAMIC_LIB_DIRS )
 				set( _ENTRIES "SET PATH=${_DYNAMIC_LIB_DIRS};%PATH%\n" )
-			endif( _DYNAMIC_LIB_DIRS )
+			endif()
 			if( VISTACORELIBS_DRIVER_PLUGIN_DIRS )
 				set( _ENTRIES "${_ENTRIES}SET VISTACORELIBS_DRIVER_PLUGIN_DIRS=${VISTACORELIBS_DRIVER_PLUGIN_DIRS}\n" )
-			endif( VISTACORELIBS_DRIVER_PLUGIN_DIRS )
+			endif()
 			if( VISTA_SHADER_DIRECTORIS )
 				set( _ENTRIES "${_ENTRIES}SET VISTA_SHADER_DIRS=${VISTA_SHADER_DIRECTORIS}\n" )
-			endif( VISTA_SHADER_DIRECTORIS )
+			endif()
 			set( _ENVVARNAME "" )
 			foreach( _ENTRY ${VISTA_ENVVARS} ${VISTA_${_PACKAGE_NAME}_ENVVARS} )
-				if( "${_ENVVARNAME}" STREQUAL "" )
-					set( _ENVVARNAME ${_ENTRY} )
+				if( _ENVVARNAME STREQUAL "" )
+					set( _ENVVARNAME "${_ENTRY}" )
 				else()
 					set( _ENTRIES "${_ENTRIES}SET ${_ENVVARNAME}=${_ENTRY}\n" )
 					set( _ENVVARNAME "" )
-				endif( "${_ENVVARNAME}" STREQUAL "" )
-			endforeach( _ENTRY ${VISTA_${_PACKAGE_NAME}_ENVVAR} )
+				endif()
+			endforeach()
 						
 			if( VISTA_ENVIRONMENT_SCRIPT_FILE )
 				set( ${_PACKAGE_NAME_UPPER}_SET_PATH_SCRIPT "${${_PACKAGE_NAME_UPPER}_TARGET_OUTDIR}/set_path_for_${_PACKAGE_NAME}.bat" )
@@ -1088,8 +1088,8 @@ macro( vista_configure_app _PACKAGE_NAME )
 						"${${_PACKAGE_NAME_UPPER}_SET_PATH_SCRIPT}"
 						@ONLY
 				)
-			endif( VISTA_ENVIRONMENT_SCRIPT_FILE )
-		elseif( UNIX )
+			endif()
+		elseif()
 			find_file( VISTA_ENVIRONMENT_SCRIPT_FILE "set_path.sh_proto" ${CMAKE_MODULE_PATH} )
 			mark_as_advanced( VISTA_ENVIRONMENT_SCRIPT_FILE )
 			
@@ -1100,17 +1100,17 @@ macro( vista_configure_app _PACKAGE_NAME )
 					if( NOT "${_ENTRY}" STREQUAL "/usr/lib" AND NOT "${_ENTRY}" STREQUAL "/usr/lib64" AND NOT "${_ENTRY}" STREQUAL "/lib" )
 						set( _ENTRIES "${_ENTRIES}${_ENTRY}:" )
 					endif()
-				endforeach (_ENTRY ${_DYNAMIC_LIB_DIRS} )
+				endforeach()
 				set ( _ENTRIES "${_ENTRIES}$LD_LIBRARY_PATH\n" )
-			endif( _DYNAMIC_LIB_DIRS )
+			endif()
 			if( VISTACORELIBS_DRIVER_PLUGIN_DIRS)
 				string( REPLACE ";" ":" _VISTACORELIBS_DRIVER_PLUGIN_DIRS_ENV "${VISTACORELIBS_DRIVER_PLUGIN_DIRS}" )
 				set( _ENTRIES "${_ENTRIES}export VISTACORELIBS_DRIVER_PLUGIN_DIRS=${_VISTACORELIBS_DRIVER_PLUGIN_DIRS_ENV}\n" )
-			endif( VISTACORELIBS_DRIVER_PLUGIN_DIRS )
+			endif()
 			if( VISTA_SHADER_DIRECTORIS)
 				string( REPLACE ";" ":" _VISTA_SHADER_DIRECTORIES_ENV "${VISTA_SHADER_DIRECTORIS}" )
 				set( _ENTRIES "${_ENTRIES}export VISTA_SHADER_DIRS=${_VISTA_SHADER_DIRECTORIES_ENV}\n" )
-			endif( VISTA_SHADER_DIRECTORIS )
+			endif()
 			set( _ENVVARNAME "" )
 			foreach( _ENTRY ${VISTA_ENVVARS} ${VISTA_${_PACKAGE_NAME}_ENVVARS} )
 				if( "${_ENVVARNAME}" STREQUAL "" )
@@ -1118,8 +1118,8 @@ macro( vista_configure_app _PACKAGE_NAME )
 				else()
 					set( _ENTRIES "${_ENTRIES}export ${_ENVVARNAME}=${_ENTRY}\n" )
 					set( _ENVVARNAME "" )
-				endif( "${_ENVVARNAME}" STREQUAL "" )
-			endforeach( _ENTRY ${VISTA_${_PACKAGE_NAME}_ENVVAR} )
+				endif()
+			endforeach()
 			
 			if( VISTA_ENVIRONMENT_SCRIPT_FILE )
 				set( ${_PACKAGE_NAME_UPPER}_SET_PATH_SCRIPT "${${_PACKAGE_NAME_UPPER}_TARGET_OUTDIR}/set_path_for_${_PACKAGE_NAME}.sh" )
@@ -1128,8 +1128,8 @@ macro( vista_configure_app _PACKAGE_NAME )
 						"${${_PACKAGE_NAME_UPPER}_SET_PATH_SCRIPT}"
 						@ONLY
 				)
-			endif( VISTA_ENVIRONMENT_SCRIPT_FILE )
-		endif( WIN32 )
+			endif()
+		endif()
 	endif()
 
 	# set up copying of executable after build
@@ -1208,13 +1208,13 @@ macro( vista_configure_app _PACKAGE_NAME )
 			
 			set( _ENVVARNAME "" )
 			foreach( _ENTRY ${VISTA_${_PACKAGE_NAME}_ENVVARS} ${VISTA_ENVVARS} )
-				if( "${_ENVVARNAME}" STREQUAL "" )
-					set( _ENVVARNAME ${_ENTRY} )
+				if( _ENVVARNAME STREQUAL "" )
+					set( _ENVVARNAME "${_ENTRY}" )
 				else()
 					set( _ENVIRONMENT "${_ENVIRONMENT}${_ENVVARNAME}=${_ENTRY}
" )
 					set( _ENVVARNAME "" )
-				endif( "${_ENVVARNAME}" STREQUAL "" )
-			endforeach( _ENTRY ${VISTA_${_PACKAGE_NAME}_ENVVAR} )
+				endif()
+			endforeach()
 			
 			set( _COMMANDARGS ${VISTA_${_PACKAGE_NAME}_MSVC_ARGUMENTS} )