diff --git a/include/boost/graph/filtered_graph.hpp b/include/boost/graph/filtered_graph.hpp
index 6ac82927..74fea461 100644
--- a/include/boost/graph/filtered_graph.hpp
+++ b/include/boost/graph/filtered_graph.hpp
@@ -195,7 +195,6 @@ namespace boost {
 
     typedef filtered_graph_tag graph_tag;
 
-#ifndef BOOST_GRAPH_NO_BUNDLED_PROPERTIES
     // Bundled properties support
     template<typename Descriptor>
     typename graph::detail::bundled_result<Graph, Descriptor>::type&
@@ -206,7 +205,6 @@ namespace boost {
     typename graph::detail::bundled_result<Graph, Descriptor>::type const&
     operator[](Descriptor x) const
     { return this->m_g[x]; }
-#endif // BOOST_GRAPH_NO_BUNDLED_PROPERTIES
 
     static vertex_descriptor null_vertex()
     {
@@ -222,26 +220,21 @@ namespace boost {
   template <typename Graph, 
             typename EdgePredicate,
             typename VertexPredicate>
-  struct vertex_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> > {
-    typedef typename vertex_property_type<Graph>::type type;
-  };
+  struct vertex_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> >:
+    vertex_property_type<Graph> {};
 
   template <typename Graph, 
             typename EdgePredicate,
             typename VertexPredicate>
-  struct edge_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> > {
-    typedef typename edge_property_type<Graph>::type type;
-  };
+  struct edge_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> >:
+    edge_property_type<Graph> {};
 
   template <typename Graph, 
             typename EdgePredicate,
             typename VertexPredicate>
-  struct graph_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> > {
-    typedef typename graph_property_type<Graph>::type type;
-  };
+  struct graph_property_type<filtered_graph<Graph, EdgePredicate, VertexPredicate> >:
+    graph_property_type<Graph> {};
 
-
-#ifndef BOOST_GRAPH_NO_BUNDLED_PROPERTIES
   template<typename Graph, typename EdgePredicate, typename VertexPredicate>
   struct vertex_bundle_type<filtered_graph<Graph, EdgePredicate, 
                                            VertexPredicate> > 
@@ -256,7 +249,6 @@ namespace boost {
   struct graph_bundle_type<filtered_graph<Graph, EdgePredicate, 
                                           VertexPredicate> > 
     : graph_bundle_type<Graph> { };
-#endif // BOOST_GRAPH_NO_BUNDLED_PROPERTIES
 
   //===========================================================================
   // Non-member functions for the Filtered Edge Graph