Adjust to changed predicate names

33 files changed, 108 insertions, 110 deletions

diff --git a/xsde/cxx/elements.cxx b/xsde/cxx/elements.cxx
index a67905d..49d7f34 100644
--- a/xsde/cxx/elements.cxx
+++ b/xsde/cxx/elements.cxx
@@ -288,7 +288,7 @@ namespace CXX
       SemanticGraph::Path path;
       Schema& schema (dynamic_cast<Schema&> (ns.scope ()));
 
-      if (schema.used ())
+      if (schema.used_p ())
       {
         // Here we need to detect a special multi-schema compilation
         // case where the root schemas are imported into a special
@@ -456,7 +456,7 @@ namespace CXX
     // is where the type was defined.
     //
 
-    if (n.named ())
+    if (n.named_p ())
     {
       SemanticGraph::Scope& s (n.scope ());
 
diff --git a/xsde/cxx/hybrid/aggregate-include.hxx b/xsde/cxx/hybrid/aggregate-include.hxx
index 87de6c0..cffbd9c 100644
--- a/xsde/cxx/hybrid/aggregate-include.hxx
+++ b/xsde/cxx/hybrid/aggregate-include.hxx
@@ -134,7 +134,7 @@ namespace CXX
         //
         for (;;)
         {
-          if (!s->used ())
+          if (!s->used_p ())
             break;
 
           SemanticGraph::Uses& u (*s->used_begin ());
diff --git a/xsde/cxx/hybrid/extraction-source.cxx b/xsde/cxx/hybrid/extraction-source.cxx
index a437613..3b98100 100644
--- a/xsde/cxx/hybrid/extraction-source.cxx
+++ b/xsde/cxx/hybrid/extraction-source.cxx
@@ -164,7 +164,7 @@ namespace CXX
         {
           // Nothing is serialized for fixed attributes.
           //
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
           SemanticGraph::Type& t (a.type ());
@@ -182,9 +182,9 @@ namespace CXX
 
           os << "{";
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
-            if (!a.default_ ())
+            if (!a.default_p ())
             {
               os << "bool p;";
 
@@ -257,9 +257,9 @@ namespace CXX
                  << "return false;";
           }
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
-            if (!a.default_ ())
+            if (!a.default_p ())
             {
               os << "}"
                  << "else" << endl
diff --git a/xsde/cxx/hybrid/insertion-source.cxx b/xsde/cxx/hybrid/insertion-source.cxx
index 1324147..2122e8a 100644
--- a/xsde/cxx/hybrid/insertion-source.cxx
+++ b/xsde/cxx/hybrid/insertion-source.cxx
@@ -147,12 +147,12 @@ namespace CXX
         {
           // Don't waste space on fixed attributes.
           //
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
-            if (!a.default_ ())
+            if (!a.default_p ())
             {
               String const& present (epresent (a));
 
@@ -190,7 +190,7 @@ namespace CXX
             os << "if (!(s << x." << name << " ()))" << endl
                << "return false;";
 
-          if (a.optional ())
+          if (a.optional_p ())
             os << "}";
         }
       };
diff --git a/xsde/cxx/hybrid/parser-header.cxx b/xsde/cxx/hybrid/parser-header.cxx
index 65f7024..d67cdca 100644
--- a/xsde/cxx/hybrid/parser-header.cxx
+++ b/xsde/cxx/hybrid/parser-header.cxx
@@ -543,7 +543,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
           String const& arg (parg_type (a.type ()));
diff --git a/xsde/cxx/hybrid/parser-source.cxx b/xsde/cxx/hybrid/parser-source.cxx
index c13cbd2..525f364 100644
--- a/xsde/cxx/hybrid/parser-source.cxx
+++ b/xsde/cxx/hybrid/parser-source.cxx
@@ -1300,7 +1300,7 @@ namespace CXX
         {
           using SemanticGraph::Complex;
 
-          if (a.fixed ())
+          if (a.fixed_p ())
             return;
 
           String const& name (epname (a));
diff --git a/xsde/cxx/hybrid/serializer-header.cxx b/xsde/cxx/hybrid/serializer-header.cxx
index 55b1697..ad56f43 100644
--- a/xsde/cxx/hybrid/serializer-header.cxx
+++ b/xsde/cxx/hybrid/serializer-header.cxx
@@ -461,7 +461,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "virtual bool" << endl
                << espresent (a) << " ();"
diff --git a/xsde/cxx/hybrid/serializer-source.cxx b/xsde/cxx/hybrid/serializer-source.cxx
index b9099f6..9377c5f 100644
--- a/xsde/cxx/hybrid/serializer-source.cxx
+++ b/xsde/cxx/hybrid/serializer-source.cxx
@@ -1044,17 +1044,17 @@ namespace CXX
 
           String access (access_seq (a));
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "bool " << s << "::" << endl
                << espresent (a) << " ()"
                << "{";
 
-            if (a.default_ ())
+            if (a.default_p ())
             {
               Boolean omit (options.value<CLI::omit_default_attributes> ());
 
-              if (a.fixed ())
+              if (a.fixed_p ())
                 os << "return " << (omit ? "false" : "true") << ";";
               else
               {
diff --git a/xsde/cxx/hybrid/tree-header.cxx b/xsde/cxx/hybrid/tree-header.cxx
index a7bf6ed..7e748bb 100644
--- a/xsde/cxx/hybrid/tree-header.cxx
+++ b/xsde/cxx/hybrid/tree-header.cxx
@@ -977,7 +977,7 @@ namespace CXX
           virtual Void
           traverse (Type& a)
           {
-            if (!a.fixed ())
+            if (!a.fixed_p ())
               Traversal::Attribute::traverse (a);
           }
         };
@@ -1002,14 +1002,14 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             SemanticGraph::Type& t (a.type ());
 
             var_.dispatch (t);
             os << " " << emember (a) << ";";
 
-            if (a.optional () && !a.default_ () && fixed_length (t))
+            if (a.optional_p () && !a.default_p () && fixed_length (t))
               os << "unsigned char " << epresent_member (a) << ";";
           }
         }
@@ -1317,14 +1317,14 @@ namespace CXX
           os << "// " << comment (a.name ()) << endl
              << "// " << endl;
 
-          Boolean def (a.default_ ());
-          Boolean fix (a.fixed ());
+          Boolean def (a.default_p ());
+          Boolean fix (a.fixed_p ());
 
           String const& name (ename (a));
           SemanticGraph::Type& t (a.type ());
 
 
-          if (a.optional () && !fix)
+          if (a.optional_p () && !fix)
           {
             String const& name (def ? edefault (a) : epresent (a));
 
diff --git a/xsde/cxx/hybrid/tree-inline.cxx b/xsde/cxx/hybrid/tree-inline.cxx
index d2e625f..1da9261 100644
--- a/xsde/cxx/hybrid/tree-inline.cxx
+++ b/xsde/cxx/hybrid/tree-inline.cxx
@@ -357,8 +357,8 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          Boolean def (a.default_ ());
-          Boolean fix (a.fixed ());
+          Boolean def (a.default_p ());
+          Boolean fix (a.fixed_p ());
 
           String const& name (ename (a));
           String member;
@@ -370,7 +370,7 @@ namespace CXX
           Boolean fl (fixed_length (t));
           String scope (Context::scope (a));
 
-          if (a.optional () && !fix)
+          if (a.optional_p () && !fix)
           {
             String const& name (def ? edefault (a) : epresent (a));
 
@@ -537,7 +537,7 @@ namespace CXX
 
             os << "this->" << member << " = x;";
 
-            if (fl && !def && a.optional ())
+            if (fl && !def && a.optional_p ())
               os << "this->" << epresent_member (a) << " = true;";
 
             os << "}";
diff --git a/xsde/cxx/hybrid/tree-name-processor.cxx b/xsde/cxx/hybrid/tree-name-processor.cxx
index 10a9280..95aab7b 100644
--- a/xsde/cxx/hybrid/tree-name-processor.cxx
+++ b/xsde/cxx/hybrid/tree-name-processor.cxx
@@ -409,14 +409,14 @@ namespace CXX
         {
           SemanticGraph::Context& ac (a.context ());
 
-          Boolean def (a.default_ ());
-          Boolean fix (a.fixed ());
+          Boolean def (a.default_p ());
+          Boolean fix (a.fixed_p ());
 
           String const& base (ac.get<String> ("name"));
 
           if (!data_members_)
           {
-            if (a.optional () && !fix)
+            if (a.optional_p () && !fix)
             {
               String n;
               if (def)
@@ -440,7 +440,7 @@ namespace CXX
           }
           else if (!fix)
           {
-            if (a.optional () && !a.default_ () && fixed_length (a.type ()))
+            if (a.optional_p () && !a.default_p () && fixed_length (a.type ()))
             {
               ac.set ("present-member",
                       find_name (ac.get<String> ("present") + L"_", set_));
diff --git a/xsde/cxx/hybrid/tree-source.cxx b/xsde/cxx/hybrid/tree-source.cxx
index 0c988c1..ba2562d 100644
--- a/xsde/cxx/hybrid/tree-source.cxx
+++ b/xsde/cxx/hybrid/tree-source.cxx
@@ -314,7 +314,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.default_ ())
+          if (a.default_p ())
           {
             SemanticGraph::Type& t (a.type ());
 
@@ -797,9 +797,9 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
-            Boolean def (a.default_ ());
+            Boolean def (a.default_p ());
             Boolean fl (fixed_length (a.type ()));
 
             if (!fl)
@@ -812,7 +812,7 @@ namespace CXX
                 edefault_value (a) << " ();";
             }
 
-            if (fl && !def && a.optional ())
+            if (fl && !def && a.optional_p ())
               os << "this->" << epresent_member (a) << " = false;";
           }
         }
@@ -934,7 +934,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             SemanticGraph::Type& t (a.type ());
 
@@ -1063,11 +1063,11 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             String const& member (emember (a));
 
-            if (a.optional () && !a.default_ ())
+            if (a.optional_p () && !a.default_p ())
             {
               String const& present (epresent_member (a));
 
@@ -1207,11 +1207,11 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (!a.fixed ())
+          if (!a.fixed_p ())
           {
             String const& member (emember (a));
 
-            if (a.optional () && !a.default_ ())
+            if (a.optional_p () && !a.default_p ())
             {
               String const& present (epresent_member (a));
 
diff --git a/xsde/cxx/hybrid/validator.cxx b/xsde/cxx/hybrid/validator.cxx
index 7641025..579af88 100644
--- a/xsde/cxx/hybrid/validator.cxx
+++ b/xsde/cxx/hybrid/validator.cxx
@@ -57,7 +57,7 @@ namespace CXX
           if (n.is_a<SemanticGraph::Namespace> ())
             return L"<namespace-level>"; // There is a bug if you see this.
 
-          assert (n.named ());
+          assert (n.named_p ());
 
           SemanticGraph::Scope& scope (n.scope ());
 
@@ -111,7 +111,7 @@ namespace CXX
           {
             SemanticGraph::Type& t (c.inherits ().base ());
 
-            if (t.named () &&
+            if (t.named_p () &&
                 types_.find (
                   t.scope ().name () + L"#" + t.name ()) == types_.end ())
             {
@@ -147,7 +147,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
           {
             types_.insert (t.scope ().name () + L"#" + t.name ());
           }
@@ -221,7 +221,7 @@ namespace CXX
         {
           SemanticGraph::Type& t (m.type ());
 
-          if (!t.named ()
+          if (!t.named_p ()
               && !t.is_a<SemanticGraph::Fundamental::IdRef> ()
               && !t.is_a<SemanticGraph::Fundamental::IdRefs> ())
           {
diff --git a/xsde/cxx/parser/attribute-validation-source.cxx b/xsde/cxx/parser/attribute-validation-source.cxx
index 218f192..22c70c4 100644
--- a/xsde/cxx/parser/attribute-validation-source.cxx
+++ b/xsde/cxx/parser/attribute-validation-source.cxx
@@ -28,7 +28,7 @@ namespace CXX
         {
           String const& name (a.name ());
 
-          if (a.qualified () && a.namespace_ ().name ())
+          if (a.qualified_p () && a.namespace_ ().name ())
           {
             String const& ns (a.namespace_ ().name ());
 
@@ -151,7 +151,7 @@ namespace CXX
 
           os << "}";
 
-          if (!a.optional ())
+          if (!a.optional_p ())
             os << "static_cast< v_state_attr_* > (" <<
               "this->v_state_attr_stack_.top ())->" << name << " = true;";
 
@@ -204,7 +204,7 @@ namespace CXX
         virtual Void
         traverse (Type& a)
         {
-          if (!a.optional ())
+          if (!a.optional_p ())
             os << "as." << ename (a) << " = false;";
         }
       };
@@ -222,9 +222,9 @@ namespace CXX
         virtual Void
         traverse (Type& a)
         {
-          if (!a.optional ())
+          if (!a.optional_p ())
           {
-            String ns (a.qualified () ? a.namespace_ ().name () : String ());
+            String ns (a.qualified_p () ? a.namespace_ ().name () : String ());
 
             os << "if (!as." << ename (a) << ")"
                << "{"
diff --git a/xsde/cxx/parser/characters-validation-source.cxx b/xsde/cxx/parser/characters-validation-source.cxx
index bcc5a22..f4f1bf5 100644
--- a/xsde/cxx/parser/characters-validation-source.cxx
+++ b/xsde/cxx/parser/characters-validation-source.cxx
@@ -26,7 +26,7 @@ namespace CXX
         virtual Void
         traverse (Type& c)
         {
-          if (!c.mixed ())
+          if (!c.mixed_p ())
             return;
 
           String const& name (ename (c));
@@ -73,4 +73,3 @@ namespace CXX
     }
   }
 }
-
diff --git a/xsde/cxx/parser/element-validation-source.cxx b/xsde/cxx/parser/element-validation-source.cxx
index c1ca326..5533549 100644
--- a/xsde/cxx/parser/element-validation-source.cxx
+++ b/xsde/cxx/parser/element-validation-source.cxx
@@ -211,12 +211,12 @@ namespace CXX
         traverse (SemanticGraph::Element& e)
         {
           String const& name (e.name ());
-          Boolean subst (poly_code && e.global ());
+          Boolean subst (poly_code && e.global_p ());
 
           if (subst)
             os << "(";
 
-          if (e.qualified () && e.namespace_ ().name ())
+          if (e.qualified_p () && e.namespace_ ().name ())
           {
             String const& ns (e.namespace_ ().name ());
 
@@ -338,7 +338,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Element& e)
         {
-          String ns (e.qualified () ? e.namespace_ ().name () : String ());
+          String ns (e.qualified_p () ? e.namespace_ ().name () : String ());
 
           os << L << strlit (ns) << ", " << L << strlit (e.name ());
         }
@@ -1323,7 +1323,7 @@ namespace CXX
               continue;
 
             Element& e (dynamic_cast<Element&> (ci->particle ()));
-            String ns (e.qualified () ? e.namespace_ ().name () : String ());
+            String ns (e.qualified_p () ? e.namespace_ ().name () : String ());
             UnsignedLong state (e.context ().get<UnsignedLong> ("p:state"));
 
             os << "if (count[" << state << "UL] == 0)"
diff --git a/xsde/cxx/parser/elements.cxx b/xsde/cxx/parser/elements.cxx
index fafcd52..0b98370 100644
--- a/xsde/cxx/parser/elements.cxx
+++ b/xsde/cxx/parser/elements.cxx
@@ -85,7 +85,7 @@ namespace CXX
     {
       using namespace SemanticGraph;
 
-      if (c.mixed ())
+      if (c.mixed_p ())
         return Content::mixed;
 
       if (c.inherits_p ())
diff --git a/xsde/cxx/parser/elements.hxx b/xsde/cxx/parser/elements.hxx
index f603400..4af395f 100644
--- a/xsde/cxx/parser/elements.hxx
+++ b/xsde/cxx/parser/elements.hxx
@@ -305,7 +305,7 @@ namespace CXX
       virtual Void
       traverse (Type& a)
       {
-        if (!result_ && !a.optional ())
+        if (!result_ && !a.optional_p ())
           result_ = true;
       }
 
diff --git a/xsde/cxx/parser/parser-header.cxx b/xsde/cxx/parser/parser-header.cxx
index 5bc9cb7..5062337 100644
--- a/xsde/cxx/parser/parser-header.cxx
+++ b/xsde/cxx/parser/parser-header.cxx
@@ -662,7 +662,7 @@ namespace CXX
         virtual Void
         traverse (Type& a)
         {
-          if (!a.optional ())
+          if (!a.optional_p ())
           {
             os << "bool " << ename (a) << ";";
           }
@@ -1011,7 +1011,7 @@ namespace CXX
 
           // characters
           //
-          if (validation && c.mixed ())
+          if (validation && c.mixed_p ())
           {
             os << "protected:" << endl
                << "virtual bool" << endl
diff --git a/xsde/cxx/parser/parser-source.cxx b/xsde/cxx/parser/parser-source.cxx
index f4da879..521f810 100644
--- a/xsde/cxx/parser/parser-source.cxx
+++ b/xsde/cxx/parser/parser-source.cxx
@@ -487,10 +487,10 @@ namespace CXX
         traverse (Type& e)
         {
           Boolean poly (poly_code && !anonymous (e.type ()));
-          Boolean subst (poly && e.global ());
+          Boolean subst (poly && e.global_p ());
           String const& inst (poly ? emember_cache (e) : emember (e));
 
-          if (e.qualified () && e.namespace_ ().name ())
+          if (e.qualified_p () && e.namespace_ ().name ())
           {
             os << "if (" << (subst ? "(" : "") <<
               "n == " << strlit (e.name ()) << " &&" << endl
@@ -600,10 +600,10 @@ namespace CXX
         {
           String const& name (ename (e));
           Boolean poly (poly_code && !anonymous (e.type ()));
-          Boolean subst (poly && e.global ());
+          Boolean subst (poly && e.global_p ());
           String const& inst (poly ? emember_cache (e) : emember (e));
 
-          if (e.qualified () && e.namespace_ ().name ())
+          if (e.qualified_p () && e.namespace_ ().name ())
           {
             os << "if (" << (subst ? "(" : "") <<
               "n == " << strlit (e.name ()) << " &&" << endl
@@ -701,7 +701,7 @@ namespace CXX
           String const& name (ename (a));
           String const& inst (emember (a));
 
-          if (a.qualified () && a.namespace_ ().name ())
+          if (a.qualified_p () && a.namespace_ ().name ())
           {
             os << "if (n == " << L << strlit (a.name ()) << " &&" << endl
                << "ns == " << L << strlit (a.namespace_ ().name ()) << ")"
diff --git a/xsde/cxx/parser/validator.cxx b/xsde/cxx/parser/validator.cxx
index 520ede6..aa0a6df 100644
--- a/xsde/cxx/parser/validator.cxx
+++ b/xsde/cxx/parser/validator.cxx
@@ -54,7 +54,7 @@ namespace CXX
           if (n.is_a<SemanticGraph::Namespace> ())
             return L"<namespace-level>"; // There is a bug if you see this.
 
-          assert (n.named ());
+          assert (n.named_p ());
 
           SemanticGraph::Scope& scope (n.scope ());
 
@@ -105,7 +105,7 @@ namespace CXX
           {
             using SemanticGraph::Any;
 
-            Boolean q (e.qualified ());
+            Boolean q (e.qualified_p ());
             String ns (q ? e.namespace_ ().name () : "");
 
             for (Any::NamespaceIterator i (any_.namespace_begin ());
@@ -290,7 +290,7 @@ namespace CXX
           {
             SemanticGraph::Type& t (c.inherits ().base ());
 
-            if (t.named () &&
+            if (t.named_p () &&
                 types_.find (
                   t.scope ().name () + L"#" + t.name ()) == types_.end ())
             {
@@ -328,7 +328,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
           {
             types_.insert (t.scope ().name () + L"#" + t.name ());
           }
@@ -409,7 +409,7 @@ namespace CXX
         {
           SemanticGraph::Type& t (m.type ());
 
-          if (!t.named ()
+          if (!t.named_p ()
               && !t.is_a<SemanticGraph::Fundamental::IdRef> ()
               && !t.is_a<SemanticGraph::Fundamental::IdRefs> ())
           {
diff --git a/xsde/cxx/serializer/attribute-validation-source.cxx b/xsde/cxx/serializer/attribute-validation-source.cxx
index 38e0f87..79ae256 100644
--- a/xsde/cxx/serializer/attribute-validation-source.cxx
+++ b/xsde/cxx/serializer/attribute-validation-source.cxx
@@ -105,7 +105,7 @@ namespace CXX
           os << "// " << name << endl
              << "//" << endl;
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "if (this->" << epresent (a) << " ())";
           }
@@ -147,7 +147,7 @@ namespace CXX
 
           if (exceptions)
           {
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << ");";
@@ -158,7 +158,7 @@ namespace CXX
           {
             os << "if (!";
 
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << ")";
@@ -210,7 +210,7 @@ namespace CXX
 
           os << "}"; // if (inst)
 
-          if (!a.optional ())
+          if (!a.optional_p ())
           {
             os << "else"
                << "{"
@@ -222,7 +222,7 @@ namespace CXX
 
           os << "}";
 
-          if (a.optional () && !exceptions)
+          if (a.optional_p () && !exceptions)
           {
             os << "if (ctx.error_type ())" << endl
                << "return;"
diff --git a/xsde/cxx/serializer/element-validation-source.cxx b/xsde/cxx/serializer/element-validation-source.cxx
index 06a8aa0..b39fed7 100644
--- a/xsde/cxx/serializer/element-validation-source.cxx
+++ b/xsde/cxx/serializer/element-validation-source.cxx
@@ -434,9 +434,9 @@ namespace CXX
 
           // Only a globally-defined element can be a subst-group root.
           //
-          if (poly && e.global ())
+          if (poly && e.global_p ())
           {
-            if (e.qualified () && e.namespace_ ().name ())
+            if (e.qualified_p () && e.namespace_ ().name ())
               os << "const char* ns = " <<
                 strlit (e.namespace_ ().name ()) << ";";
             else
@@ -477,7 +477,7 @@ namespace CXX
           {
             if (exceptions)
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << ");";
@@ -488,7 +488,7 @@ namespace CXX
             {
               os << "if (!";
 
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << ")";
diff --git a/xsde/cxx/serializer/elements.cxx b/xsde/cxx/serializer/elements.cxx
index ba59a82..12a715c 100644
--- a/xsde/cxx/serializer/elements.cxx
+++ b/xsde/cxx/serializer/elements.cxx
@@ -86,7 +86,7 @@ namespace CXX
     {
       using namespace SemanticGraph;
 
-      if (c.mixed ())
+      if (c.mixed_p ())
         return Content::mixed;
 
       if (c.inherits_p ())
diff --git a/xsde/cxx/serializer/elements.hxx b/xsde/cxx/serializer/elements.hxx
index 470d6c4..df1f486 100644
--- a/xsde/cxx/serializer/elements.hxx
+++ b/xsde/cxx/serializer/elements.hxx
@@ -319,7 +319,7 @@ namespace CXX
       virtual Void
       traverse (Type& a)
       {
-        if (!result_ && !a.optional ())
+        if (!result_ && !a.optional_p ())
           result_ = true;
       }
 
diff --git a/xsde/cxx/serializer/impl-header.cxx b/xsde/cxx/serializer/impl-header.cxx
index 82ce803..94b982a 100644
--- a/xsde/cxx/serializer/impl-header.cxx
+++ b/xsde/cxx/serializer/impl-header.cxx
@@ -305,7 +305,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "virtual bool" << endl
                << epresent (a) << " ();"
diff --git a/xsde/cxx/serializer/impl-source.cxx b/xsde/cxx/serializer/impl-source.cxx
index 74eabbd..280d74c 100644
--- a/xsde/cxx/serializer/impl-source.cxx
+++ b/xsde/cxx/serializer/impl-source.cxx
@@ -455,7 +455,7 @@ namespace CXX
           String const& s (
             eimpl (dynamic_cast<SemanticGraph::Complex&> (a.scope ())));
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "bool " << s << "::" << endl
                << epresent (a) << " ()"
diff --git a/xsde/cxx/serializer/name-processor.cxx b/xsde/cxx/serializer/name-processor.cxx
index bc7ac8a..ec4c442 100644
--- a/xsde/cxx/serializer/name-processor.cxx
+++ b/xsde/cxx/serializer/name-processor.cxx
@@ -603,7 +603,7 @@ namespace CXX
           {
             String const& base (ac.get<String> ("s:name"));
 
-            if (a.optional ())
+            if (a.optional_p ())
               ac.set ("s:present", find_name (base + L"_present", set_));
 
             ac.set ("s:serializer", find_name (base + L"_serializer", set_));
@@ -615,7 +615,7 @@ namespace CXX
               *ac.get<Attribute*> ("xsd-frontend-restriction-correspondence"));
             SemanticGraph::Context& bc (b.context ());
 
-            if (a.optional ())
+            if (a.optional_p ())
               ac.set ("s:present", bc.get<String> ("s:present"));
 
             ac.set ("s:serializer", bc.get<String> ("s:serializer"));
diff --git a/xsde/cxx/serializer/serializer-header.cxx b/xsde/cxx/serializer/serializer-header.cxx
index b432f15..dd20289 100644
--- a/xsde/cxx/serializer/serializer-header.cxx
+++ b/xsde/cxx/serializer/serializer-header.cxx
@@ -862,7 +862,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Attribute& a)
         {
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "virtual bool" << endl
                << epresent (a) << " ();"
diff --git a/xsde/cxx/serializer/serializer-source.cxx b/xsde/cxx/serializer/serializer-source.cxx
index e4fd239..a5765a0 100644
--- a/xsde/cxx/serializer/serializer-source.cxx
+++ b/xsde/cxx/serializer/serializer-source.cxx
@@ -1095,9 +1095,9 @@ namespace CXX
 
             // Only a globally-defined element can be a subst-group root.
             //
-            if (poly && e.global ())
+            if (poly && e.global_p ())
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "const char* ns = " <<
                   strlit (e.namespace_ ().name ()) << ";";
               else
@@ -1119,7 +1119,7 @@ namespace CXX
             }
             else
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << ");";
@@ -1177,9 +1177,9 @@ namespace CXX
 
             // Only a globally-defined element can be a subst-group root.
             //
-            if (poly && e.global ())
+            if (poly && e.global_p ())
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "const char* ns = " <<
                   strlit (e.namespace_ ().name ()) << ";";
               else
@@ -1207,7 +1207,7 @@ namespace CXX
             }
             else
             {
-              if (e.qualified () && e.namespace_ ().name ())
+              if (e.qualified_p () && e.namespace_ ().name ())
                 os << "if (!this->_start_element (" <<
                   strlit (e.namespace_ ().name ()) << ", " <<
                   strlit (e.name ()) << "))" << endl
@@ -1432,7 +1432,7 @@ namespace CXX
           os << "// " << name << endl
              << "//" << endl;
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             os << "if (this->" << epresent (a) << " ())";
           }
@@ -1465,7 +1465,7 @@ namespace CXX
             else
               os << "this->" << inst << "->pre (r);";
 
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << ");";
@@ -1494,7 +1494,7 @@ namespace CXX
                << "return;"
                << endl;
 
-            if (a.qualified () && a.namespace_ ().name ())
+            if (a.qualified_p () && a.namespace_ ().name ())
               os << "if (!this->_start_attribute (" <<
                 strlit (a.namespace_ ().name ()) << ", " <<
                 strlit (a.name ()) << "))" << endl
@@ -1545,7 +1545,7 @@ namespace CXX
           os << "}"  // if (inst)
              << "}";
 
-          if (a.optional () && !exceptions)
+          if (a.optional_p () && !exceptions)
           {
             os << "if (ctx.error_type ())" << endl
                << "return;"
@@ -2160,7 +2160,7 @@ namespace CXX
           if (tiein)
             impl = etiein (dynamic_cast<SemanticGraph::Type&> (a.scope ()));
 
-          if (a.optional ())
+          if (a.optional_p ())
           {
             String const& present (epresent (a));
 
diff --git a/xsde/cxx/serializer/validator.cxx b/xsde/cxx/serializer/validator.cxx
index f5125e0..b3e60d9 100644
--- a/xsde/cxx/serializer/validator.cxx
+++ b/xsde/cxx/serializer/validator.cxx
@@ -54,7 +54,7 @@ namespace CXX
           if (n.is_a<SemanticGraph::Namespace> ())
             return L"<namespace-level>"; // There is a bug if you see this.
 
-          assert (n.named ());
+          assert (n.named_p ());
 
           SemanticGraph::Scope& scope (n.scope ());
 
@@ -108,7 +108,7 @@ namespace CXX
           {
             SemanticGraph::Type& t (c.inherits ().base ());
 
-            if (t.named () &&
+            if (t.named_p () &&
                 types_.find (
                   t.scope ().name () + L"#" + t.name ()) == types_.end ())
             {
@@ -144,7 +144,7 @@ namespace CXX
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
           {
             types_.insert (t.scope ().name () + L"#" + t.name ());
           }
@@ -218,7 +218,7 @@ namespace CXX
         {
           SemanticGraph::Type& t (m.type ());
 
-          if (!t.named ()
+          if (!t.named_p ()
               && !t.is_a<SemanticGraph::Fundamental::IdRef> ()
               && !t.is_a<SemanticGraph::Fundamental::IdRefs> ())
           {
diff --git a/xsde/elements.hxx b/xsde/elements.hxx
index 2e794e0..c956077 100644
--- a/xsde/elements.hxx
+++ b/xsde/elements.hxx
@@ -70,7 +70,7 @@ public:
   {
     SemanticGraph::Type& t (e.type ());
 
-    if (!t.named () && !t.context ().count ("seen"))
+    if (!t.named_p () && !t.context ().count ("seen"))
     {
       t.context ().set ("seen", true);
 
@@ -89,7 +89,7 @@ public:
   {
     SemanticGraph::Type& t (a.type ());
 
-    if (!t.named () && !t.context ().count ("seen"))
+    if (!t.named_p () && !t.context ().count ("seen"))
     {
       t.context ().set ("seen", true);
 
@@ -132,4 +132,3 @@ private:
 };
 
 #endif // ELEMENTS_HXX
-
diff --git a/xsde/processing/inheritance/processor.cxx b/xsde/processing/inheritance/processor.cxx
index bc42ca4..7c6a411 100644
--- a/xsde/processing/inheritance/processor.cxx
+++ b/xsde/processing/inheritance/processor.cxx
@@ -59,7 +59,7 @@ namespace Processing
         if (dynamic_cast<SemanticGraph::Namespace*> (&n) != 0)
           return L"<namespace-level>"; // There is a bug if you see this.
 
-        if (n.named ())
+        if (n.named_p ())
         {
           SemanticGraph::Scope& scope (n.scope ());
 
@@ -121,7 +121,7 @@ namespace Processing
         {
           SemanticGraph::Type& t (m.type ());
 
-          if (!t.named ())
+          if (!t.named_p ())
           {
             if (types_seen_.find (&t) == types_seen_.end ())
             {
@@ -224,7 +224,7 @@ namespace Processing
         virtual Void
         traverse (SemanticGraph::Type& t)
         {
-          if (t.named ())
+          if (t.named_p ())
             types_seen_.insert (&t);
         }
 
@@ -247,7 +247,7 @@ namespace Processing
         {
           SemanticGraph::Type& t (e.type ());
 
-          if (!t.named ())
+          if (!t.named_p ())
           {
             t.context ().set ("instance-name", xpath (e));
             check_dep (e, t);
@@ -358,7 +358,7 @@ namespace Processing
               //
               String name (t.name ());
               {
-                Names& n (t.named_ ());
+                Names& n (t.named ());
                 root_.delete_edge (scope, t, n);
               }
 
@@ -367,7 +367,7 @@ namespace Processing
               {
                 // Convert to the insert-after call.
                 //
-                Scope::NamesIterator i (scope.find (global.named_ ()));
+                Scope::NamesIterator i (scope.find (global.named ()));
 
                 if (i == scope.names_begin ())
                   i = scope.names_end ();