diff --git a/amdis/common/Logical.hpp b/amdis/common/Logical.hpp
index 2a9d32ef945a82d56f817a60029cb1de86544a8e..decbe539af259a3abfda1752bbff0a87099d3f50 100644
--- a/amdis/common/Logical.hpp
+++ b/amdis/common/Logical.hpp
@@ -18,35 +18,29 @@ namespace AMDiS
   // some boolean operations
   // ---------------------------------------------------------------------------
 
-  namespace Impl
-  {
-    template <bool...> struct all_helper {};
-
-  } // end namespace Impl
-
   template <bool... Bs>
-  using all_of_t = bool_t<(Bs &&...)>;
+  constexpr bool all_of_v = (Bs && ...);
 
   template <bool... Bs>
-  constexpr bool all_of_v = (Bs &&...);
+  using all_of_t = bool_t<all_of_v<Bs...>>;
 
   template <bool... Bs>
   using and_t = all_of_t<Bs...>;
 
   template <bool... Bs>
-  using none_of_t = bool_t<!(Bs ||...)>;
+  constexpr bool any_of_v = (Bs || ...);
 
   template <bool... Bs>
-  constexpr bool none_of_v = !(Bs ||...);
+  using any_of_t = bool_t<any_of_v<Bs...>>;
 
   template <bool... Bs>
-  using any_of_t = bool_t<(Bs ||...)>;
+  using or_t = any_of_t<Bs...>;
 
   template <bool... Bs>
-  constexpr bool any_of_v = (Bs ||...);
+  constexpr bool none_of_v = !(Bs || ...);
 
   template <bool... Bs>
-  using or_t = any_of_t<Bs...>;
+  using none_of_t = bool_t<none_of_v<Bs...>>;
 
 
   template <bool... Bs>