diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index d8446148ac..5e6c33816f 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -590,8 +590,8 @@ wxString wxFileName::GetShortPath() const
     }
     if (ok)
         return pathOut;
-    else
-        return path;
+
+    return path;
 #else
     return GetFullPath();
 #endif
@@ -605,7 +605,8 @@ wxString wxFileName::GetLongPath() const
     wxString pathOut;
     bool success = FALSE;
 
-#if wxUSE_DYNLIB_CLASS
+    // VZ: this code was disabled, why?
+#if 0 // wxUSE_DYNLIB_CLASS
     typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
 
     static bool s_triedToLoad = FALSE;
@@ -613,7 +614,6 @@ wxString wxFileName::GetLongPath() const
     if ( !s_triedToLoad )
     {
         s_triedToLoad = TRUE;
-#if 0
         wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
         if ( dllKernel )
         {
@@ -651,12 +651,10 @@ wxString wxFileName::GetLongPath() const
                 }
             }
         }
-#endif		
     }
     if (success)
         return pathOut;
-#endif
-    // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS
 
     if (!success)
     {
@@ -705,6 +703,7 @@ wxString wxFileName::GetLongPath() const
             }
         }
     }
+
     return pathOut;
 #else
     return GetFullPath();
diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp
index d00e4d958b..ed3ad90ffe 100644
--- a/src/generic/dirctrlg.cpp
+++ b/src/generic/dirctrlg.cpp
@@ -1074,8 +1074,8 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
         description = descriptions[n];
         return TRUE;
     }
-    else
-        return FALSE;
+
+    return FALSE;
 }
 
 // Parses the global filter, returning the number of filters.
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index ed745c827f..6c61c9f6e4 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -2314,8 +2314,8 @@ wxTreeItemId wxGenericTreeCtrl::HitTest(const wxPoint& point, int& flags)
 
     if (m_anchor)
         return m_anchor->HitTest( wxPoint(x, y), this, flags);
-    else
-        return wxTreeItemId();
+
+    return wxTreeItemId();
 }
 
 // get the bounding rectangle of the item (or of its label only)
diff --git a/src/html/htmltag.cpp b/src/html/htmltag.cpp
index 1632ed6987..e725a033ab 100644
--- a/src/html/htmltag.cpp
+++ b/src/html/htmltag.cpp
@@ -376,8 +376,9 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
         HTML_COLOUR("teal",    0x00,0x80,0x80)
         HTML_COLOUR("aqua",    0x00,0xFF,0xFF)
         #undef HTML_COLOUR
-        return FALSE;
     }
+
+    return FALSE;
 }
 
 bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const