diff --git a/src/common/chapters/chapters.cpp b/src/common/chapters/chapters.cpp
index f10af5789..8d4cc2361 100644
--- a/src/common/chapters/chapters.cpp
+++ b/src/common/chapters/chapters.cpp
@@ -941,7 +941,7 @@ move_chapters_by_edition(KaxChapters &dst,
       // Move all atoms from the old edition to the new one.
       size_t master_idx;
       for (master_idx = 0; m->ListSize() > master_idx; master_idx++)
-        if (is_id((*m)[master_idx], KaxChapterAtom))
+        if (Is<KaxChapterAtom>((*m)[master_idx]))
           ee_dst->PushElement(*(*m)[master_idx]);
         else
           delete (*m)[master_idx];
@@ -972,7 +972,7 @@ adjust_chapter_timecodes(EbmlMaster &master,
                          int64_t offset) {
   size_t master_idx;
   for (master_idx = 0; master.ListSize() > master_idx; master_idx++) {
-    if (!is_id(master[master_idx], KaxChapterAtom))
+    if (!Is<KaxChapterAtom>(master[master_idx]))
       continue;
 
     KaxChapterAtom *atom       = static_cast<KaxChapterAtom *>(master[master_idx]);
@@ -999,7 +999,7 @@ count_chapter_atoms_recursively(EbmlMaster &master,
   size_t master_idx;
 
   for (master_idx = 0; master.ListSize() > master_idx; ++master_idx)
-    if (is_id(master[master_idx], KaxChapterAtom))
+    if (Is<KaxChapterAtom>(master[master_idx]))
       ++count;
 
     else if (dynamic_cast<EbmlMaster *>(master[master_idx]))
diff --git a/src/common/chapters/writer.cpp b/src/common/chapters/writer.cpp
index c89f10f7d..0372d4e42 100644
--- a/src/common/chapters/writer.cpp
+++ b/src/common/chapters/writer.cpp
@@ -95,10 +95,10 @@ write_chapter_display_simple(KaxChapterDisplay *display,
 
   for (i = 0; i < display->ListSize(); i++) {
     EbmlElement *e = (*display)[i];
-    if (is_id(e, KaxChapterString))
+    if (Is<KaxChapterString>(e))
       handle_name(level - 1, static_cast<EbmlUnicodeString *>(e)->GetValueUTF8().c_str());
 
-    else if (is_id(e, KaxChapterAtom))
+    else if (Is<KaxChapterAtom>(e))
       write_chapter_atom_simple((KaxChapterAtom *)e, level + 1);
 
   }
@@ -112,7 +112,7 @@ write_chapter_track_simple(KaxChapterTrack *track,
   for (i = 0; i < track->ListSize(); i++) {
     EbmlElement *e = (*track)[i];
 
-    if (is_id(e, KaxChapterAtom))
+    if (Is<KaxChapterAtom>(e))
       write_chapter_atom_simple(static_cast<KaxChapterAtom *>(e), level + 1);
 
   }
@@ -126,16 +126,16 @@ write_chapter_atom_simple(KaxChapterAtom *atom,
   for (i = 0; i < atom->ListSize(); i++) {
     EbmlElement *e = (*atom)[i];
 
-    if (is_id(e, KaxChapterTimeStart))
+    if (Is<KaxChapterTimeStart>(e))
       handle_start_time(level, static_cast<EbmlUInteger *>(e)->GetValue() / 1000000);
 
-    else if (is_id(e, KaxChapterTrack))
+    else if (Is<KaxChapterTrack>(e))
       write_chapter_track_simple(static_cast<KaxChapterTrack *>(e), level + 1);
 
-    else if (is_id(e, KaxChapterDisplay))
+    else if (Is<KaxChapterDisplay>(e))
       write_chapter_display_simple(static_cast<KaxChapterDisplay *>(e), level + 1);
 
-    else if (is_id(e, KaxChapterAtom))
+    else if (Is<KaxChapterAtom>(e))
       write_chapter_atom_simple(static_cast<KaxChapterAtom *>(e), level + 1);
 
   }
@@ -151,12 +151,12 @@ write_chapters_simple(int &chapter_num,
 
   size_t chapter_idx;
   for (chapter_idx = 0; chapters->ListSize() > chapter_idx; chapter_idx++) {
-    if (is_id((*chapters)[chapter_idx], KaxEditionEntry)) {
+    if (Is<KaxEditionEntry>((*chapters)[chapter_idx])) {
       KaxEditionEntry *edition = static_cast<KaxEditionEntry *>((*chapters)[chapter_idx]);
 
       size_t edition_idx;
       for (edition_idx = 0; edition->ListSize() > edition_idx; edition_idx++)
-        if (is_id((*edition)[edition_idx], KaxChapterAtom))
+        if (Is<KaxChapterAtom>((*edition)[edition_idx]))
           write_chapter_atom_simple(static_cast<KaxChapterAtom *>((*edition)[edition_idx]), 2);
     }
   }
diff --git a/src/common/ebml.h b/src/common/ebml.h
index 73544f391..de3a57e61 100644
--- a/src/common/ebml.h
+++ b/src/common/ebml.h
@@ -47,7 +47,6 @@ int kt_get_v_pixel_height(KaxTrackEntry &track);
 
 int write_ebml_element_head(mm_io_c &out, EbmlId const &id, int64_t content_size);
 
-#define is_id(e, ref) (EbmlId(*e) == EBML_ID(ref))
 #if !defined(EBML_INFO)
 #define EBML_INFO(ref)  ref::ClassInfos
 #endif
@@ -298,6 +297,18 @@ GetChildValue(EbmlMaster *master) {
   return GetChild<Telement>(master).GetValue();
 }
 
+template<typename T>
+bool
+Is(EbmlId const &id) {
+  return id == T::ClassInfos.GlobalId;
+}
+
+template<typename T1, typename T2, typename... Trest>
+bool
+Is(EbmlId const &id) {
+  return Is<T1>(id) || Is<T2, Trest...>(id);
+}
+
 template<typename T>
 bool
 Is(EbmlElement *e) {
@@ -310,6 +321,18 @@ Is(EbmlElement *e) {
   return !e ? false : Is<T1>(e) || Is<T2, Trest...>(e);
 }
 
+template<typename T>
+bool
+Is(EbmlElement const &e) {
+  return EbmlId(e) == T::ClassInfos.GlobalId;
+}
+
+template<typename T1, typename T2, typename... Trest>
+bool
+Is(EbmlElement const &e) {
+  return Is<T1>(e) || Is<T2, Trest...>(e);
+}
+
 EbmlElement *empty_ebml_master(EbmlElement *e);
 EbmlElement *create_ebml_element(const EbmlCallbacks &callbacks, const EbmlId &id);
 EbmlMaster *sort_ebml_master(EbmlMaster *e);
diff --git a/src/common/kax_analyzer.cpp b/src/common/kax_analyzer.cpp
index 63530422a..b984d952d 100644
--- a/src/common/kax_analyzer.cpp
+++ b/src/common/kax_analyzer.cpp
@@ -46,7 +46,7 @@ std::string
 kax_analyzer_data_c::to_string() const {
   const EbmlCallbacks *callbacks = find_ebml_callbacks(EBML_INFO(KaxSegment), m_id);
 
-  if (!callbacks && (EBML_ID(EbmlVoid) == m_id))
+  if (!callbacks && Is<EbmlVoid>(m_id))
     callbacks = &EBML_CLASS_CALLBACK(EbmlVoid);
 
   std::string name;
@@ -239,7 +239,7 @@ kax_analyzer_c::process(kax_analyzer_c::parse_mode_e parse_mode,
     if (!l0)
       throw mtx::kax_analyzer_x(Y("Not a valid Matroska file (no segment/level 0 element found)"));
 
-    if (EbmlId(*l0) == EBML_ID(KaxSegment))
+    if (Is<KaxSegment>(l0))
       break;
 
     l0->SkipData(*m_stream, EBML_CONTEXT(l0));
@@ -257,8 +257,8 @@ kax_analyzer_c::process(kax_analyzer_c::parse_mode_e parse_mode,
   while (l1 && (0 >= upper_lvl_el)) {
     m_data.push_back(kax_analyzer_data_c::create(EbmlId(*l1), l1->GetElementPosition(), l1->ElementSize(true)));
 
-    cluster_found   |= is_id(l1, KaxCluster);
-    meta_seek_found |= is_id(l1, KaxSeekHead);
+    cluster_found   |= Is<KaxCluster>(l1);
+    meta_seek_found |= Is<KaxSeekHead>(l1);
 
     l1->SkipData(*m_stream, EBML_CONTEXT(l1));
     delete l1;
@@ -449,7 +449,7 @@ kax_analyzer_c::handle_void_elements(size_t data_idx) {
 
   // Are the following elements EbmlVoid elements?
   size_t end_idx = data_idx + 1;
-  while ((m_data.size() > end_idx) && (m_data[end_idx]->m_id == EBML_ID(EbmlVoid)))
+  while ((m_data.size() > end_idx) && Is<EbmlVoid>(m_data[end_idx]->m_id))
     ++end_idx;
 
   if (end_idx > data_idx + 1)
@@ -587,7 +587,7 @@ kax_analyzer_c::remove_from_meta_seeks(EbmlId id) {
 
   for (data_idx = 0; m_data.size() > data_idx; ++data_idx) {
     // We only have to do work on SeekHead elements. Skip the others.
-    if (m_data[data_idx]->m_id != EBML_ID(KaxSeekHead))
+    if (!Is<KaxSeekHead>(m_data[data_idx]->m_id))
       continue;
 
     // Read the element from the m_file. Remember its size so that a new
@@ -603,7 +603,7 @@ kax_analyzer_c::remove_from_meta_seeks(EbmlId id) {
     bool modified = false;
     size_t sh_idx = 0;
     while (seek_head->ListSize() > sh_idx) {
-      if (EbmlId(*(*seek_head)[sh_idx]) != EBML_ID(KaxSeek)) {
+      if (!Is<KaxSeek>((*seek_head)[sh_idx])) {
         ++sh_idx;
         continue;
       }
@@ -680,7 +680,7 @@ kax_analyzer_c::merge_void_elements() {
 
   while (m_data.size() > start_idx) {
     // We only have to do work on EbmlVoid elements. Skip the others.
-    if (m_data[start_idx]->m_id != EBML_ID(EbmlVoid)) {
+    if (!Is<EbmlVoid>(m_data[start_idx]->m_id)) {
       ++start_idx;
       continue;
     }
@@ -689,7 +689,7 @@ kax_analyzer_c::merge_void_elements() {
     // there are at this position and calculate the combined size.
     size_t end_idx  = start_idx + 1;
     size_t new_size = m_data[start_idx]->m_size;
-    while ((m_data.size() > end_idx) && (m_data[end_idx]->m_id == EBML_ID(EbmlVoid))) {
+    while ((m_data.size() > end_idx) && Is<EbmlVoid>(m_data[end_idx]->m_id)) {
       new_size += m_data[end_idx]->m_size;
       ++end_idx;
     }
@@ -719,7 +719,7 @@ kax_analyzer_c::merge_void_elements() {
   // See how many void elements there are at the end of the m_file.
   start_idx = m_data.size();
 
-  while ((0 < start_idx) && (EBML_ID(EbmlVoid) == m_data[start_idx - 1]->m_id))
+  while ((0 < start_idx) && Is<EbmlVoid>(m_data[start_idx - 1]->m_id))
     --start_idx;
 
   // If there are none then we're done.
@@ -758,7 +758,7 @@ kax_analyzer_c::write_element(EbmlElement *e,
   size_t data_idx;
   for (data_idx = (ps_anywhere == strategy ? 0 : m_data.size() - 1); m_data.size() > data_idx; ++data_idx) {
     // We're only interested in EbmlVoid elements. Skip the others.
-    if (m_data[data_idx]->m_id != EBML_ID(EbmlVoid))
+    if (!Is<EbmlVoid>(m_data[data_idx]->m_id))
       continue;
 
     // Skip the element if it doesn't provide enough space.
@@ -809,7 +809,7 @@ kax_analyzer_c::add_to_meta_seek(EbmlElement *e) {
 
   for (data_idx = 0; m_data.size() > data_idx; ++data_idx) {
     // We only have to do work on SeekHead elements. Skip the others.
-    if (m_data[data_idx]->m_id != EBML_ID(KaxSeekHead))
+    if (!Is<KaxSeekHead>(m_data[data_idx]->m_id))
       continue;
 
     // Calculate how much free space there is behind the seek head.
@@ -817,7 +817,7 @@ kax_analyzer_c::add_to_meta_seek(EbmlElement *e) {
     // at the end of the m_file and that all consecutive EbmlVoid elements
     // have been merged into a single element.
     size_t available_space = m_data[data_idx]->m_size;
-    if (((data_idx + 1) < m_data.size()) && (m_data[data_idx + 1]->m_id == EBML_ID(EbmlVoid)))
+    if (((data_idx + 1) < m_data.size()) && Is<EbmlVoid>(m_data[data_idx + 1]->m_id))
       available_space += m_data[data_idx + 1]->m_size;
 
     // Read the seek head, index the element and see how much space it needs.
@@ -909,7 +909,7 @@ kax_analyzer_c::add_to_meta_seek(EbmlElement *e) {
 
   for (data_idx = 0; m_data.size() > data_idx; ++data_idx) {
     // We can only overwrite void elements. Skip the others.
-    if (m_data[data_idx]->m_id != EBML_ID(EbmlVoid))
+    if (!Is<EbmlVoid>(m_data[data_idx]->m_id))
       continue;
 
     // Skip the element if it doesn't offer enough space for the seek head.
@@ -992,7 +992,7 @@ kax_analyzer_c::read_all_meta_seeks() {
     positions_found[m_data[i]->m_pos] = true;
 
   for (i = 0; i < num_entries; i++)
-    if (EBML_ID(KaxSeekHead) == m_data[i]->m_id)
+    if (Is<KaxSeekHead>(m_data[i]->m_id))
       read_meta_seek(m_data[i]->m_pos, positions_found);
 
   std::sort(m_data.begin(), m_data.end());
@@ -1014,7 +1014,7 @@ kax_analyzer_c::read_meta_seek(uint64_t pos,
   if (!l1)
     return;
 
-  if (!is_id(l1, KaxSeekHead)) {
+  if (!Is<KaxSeekHead>(l1)) {
     delete l1;
     return;
   }
@@ -1025,7 +1025,7 @@ kax_analyzer_c::read_meta_seek(uint64_t pos,
 
   unsigned int i;
   for (i = 0; master->ListSize() > i; i++) {
-    if (!is_id((*master)[i], KaxSeek))
+    if (!Is<KaxSeek>((*master)[i]))
       continue;
 
     KaxSeek *seek      = static_cast<KaxSeek *>((*master)[i]);
@@ -1042,7 +1042,7 @@ kax_analyzer_c::read_meta_seek(uint64_t pos,
     m_data.push_back(kax_analyzer_data_c::create(the_id, seek_pos, -1));
     positions_found[seek_pos] = true;
 
-    if (EBML_ID(KaxSeekHead) == the_id)
+    if (Is<KaxSeekHead>(the_id))
       read_meta_seek(seek_pos, positions_found);
   }
 
@@ -1059,7 +1059,7 @@ kax_analyzer_c::fix_element_sizes(uint64_t file_size) {
 
 kax_analyzer_c::placement_strategy_e
 kax_analyzer_c::get_placement_strategy_for(EbmlElement *e) {
-  return EbmlId(*e) == EBML_ID(KaxTags) ? ps_end : ps_anywhere;
+  return Is<KaxTags>(e) ? ps_end : ps_anywhere;
 }
 
 // ------------------------------------------------------------
diff --git a/src/common/tags/tags.cpp b/src/common/tags/tags.cpp
index 12d188016..53015d99d 100644
--- a/src/common/tags/tags.cpp
+++ b/src/common/tags/tags.cpp
@@ -100,7 +100,7 @@ find_simple_tag(const std::string &name,
 KaxTagSimple &
 find_simple_tag(const UTFstring &name,
                 EbmlMaster &m) {
-  if (EbmlId(m) == EBML_ID(KaxTagSimple)) {
+  if (Is<KaxTagSimple>(&m)) {
     KaxTagName *tname = FindChild<KaxTagName>(&m);
     if (tname && (name == UTFstring(*tname)))
       return *static_cast<KaxTagSimple *>(&m);
@@ -108,12 +108,11 @@ find_simple_tag(const UTFstring &name,
 
   size_t i;
   for (i = 0; i < m.ListSize(); i++)
-    if ((EbmlId(*m[i]) == EBML_ID(KaxTag)) || (EbmlId(*m[i]) == EBML_ID(KaxTagSimple))) {
+    if (Is<KaxTag, KaxTagSimple>(m[i]))
       try {
         return find_simple_tag(name, *static_cast<EbmlMaster *>(m[i]));
       } catch (...) {
       }
-    }
 
   throw false;
 }
@@ -202,7 +201,7 @@ convert_old_tags(KaxTags &tags) {
 
   size_t tags_idx;
   for (tags_idx = 0; tags_idx < tags.ListSize(); tags_idx++) {
-    if (!is_id(tags[tags_idx], KaxTag))
+    if (!Is<KaxTag>(tags[tags_idx]))
       continue;
 
     KaxTag &tag = *static_cast<KaxTag *>(tags[tags_idx]);
@@ -211,7 +210,7 @@ convert_old_tags(KaxTags &tags) {
     size_t tag_idx        = 0;
     while (tag_idx < tag.ListSize()) {
       tag_idx++;
-      if (!is_id(tag[tag_idx - 1], KaxTagSimple))
+      if (!Is<KaxTagSimple>(tag[tag_idx - 1]))
         continue;
 
       KaxTagSimple &simple = *static_cast<KaxTagSimple *>(tag[tag_idx - 1]);
@@ -248,7 +247,7 @@ count_simple_tags(EbmlMaster &master) {
   int count = 0;
 
   for (auto child : master)
-    if (is_id(child, KaxTagSimple))
+    if (Is<KaxTagSimple>(child))
       ++count;
 
     else if (dynamic_cast<EbmlMaster *>(child))
@@ -260,7 +259,7 @@ count_simple_tags(EbmlMaster &master) {
 void
 remove_track_uid_tag_targets(EbmlMaster *tag) {
   for (auto el : *tag) {
-    if (!is_id(el, KaxTagTargets))
+    if (!Is<KaxTagTargets>(el))
       continue;
 
     KaxTagTargets *targets = static_cast<KaxTagTargets *>(el);
@@ -268,7 +267,7 @@ remove_track_uid_tag_targets(EbmlMaster *tag) {
 
     while (targets->ListSize() > idx_target) {
       EbmlElement *uid_el = (*targets)[idx_target];
-      if (is_id(uid_el, KaxTagTrackUID)) {
+      if (Is<KaxTagTrackUID>(uid_el)) {
         targets->Remove(idx_target);
         delete uid_el;
 
diff --git a/src/extract/attachments.cpp b/src/extract/attachments.cpp
index d99b3e91a..c74c7c5d9 100644
--- a/src/extract/attachments.cpp
+++ b/src/extract/attachments.cpp
@@ -64,16 +64,16 @@ attachment_t::parse(KaxAttached &att) {
   for (k = 0; att.ListSize() > k; ++k) {
     EbmlElement *e = att[k];
 
-    if (EbmlId(*e) == EBML_ID(KaxFileName))
+    if (Is<KaxFileName>(e))
       name = static_cast<KaxFileName *>(e)->GetValueUTF8();
 
-    else if (EbmlId(*e) == EBML_ID(KaxMimeType))
+    else if (Is<KaxMimeType>(e))
       type = static_cast<KaxMimeType *>(e)->GetValue();
 
-    else if (EbmlId(*e) == EBML_ID(KaxFileUID))
+    else if (Is<KaxFileUID>(e))
       id = static_cast<KaxFileUID *>(e)->GetValue();
 
-    else if (EbmlId(*e) == EBML_ID(KaxFileData)) {
+    else if (Is<KaxFileData>(e)) {
       fdata = static_cast<KaxFileData *>(e);
       size  = fdata->GetSize();
     }
diff --git a/src/extract/cuesheets.cpp b/src/extract/cuesheets.cpp
index c8cef027d..d58b51bdc 100644
--- a/src/extract/cuesheets.cpp
+++ b/src/extract/cuesheets.cpp
@@ -50,7 +50,7 @@ find_tag_for_track(int idx,
 
   size_t i;
   for (i = 0; i < m.ListSize(); i++) {
-    if (EbmlId(*m[i]) != EBML_ID(KaxTag))
+    if (!Is<KaxTag>(m[i]))
       continue;
 
     int64_t tag_cuid = get_tag_cuid(*static_cast<KaxTag *>(m[i]));
@@ -85,7 +85,7 @@ get_chapter_index(int idx,
   size_t i;
   std::string sidx = (boost::format("INDEX %|1$02d|") % idx).str();
   for (i = 0; i < atom.ListSize(); i++)
-    if ((EbmlId(*atom[i]) == EBML_ID(KaxChapterAtom)) &&
+    if (Is<KaxChapterAtom>(atom[i]) &&
         (get_chapter_name(*static_cast<KaxChapterAtom *>(atom[i])) == sidx))
       return get_chapter_start(*static_cast<KaxChapterAtom *>(atom[i]));
 
@@ -125,7 +125,7 @@ print_comments(const char *prefix,
   size_t i;
 
   for (i = 0; i < tag.ListSize(); i++)
-    if (is_id(tag[i], KaxTagSimple)
+    if (Is<KaxTagSimple>(tag[i])
         && (   (get_simple_tag_name(*static_cast<KaxTagSimple *>(tag[i])) == "COMMENT")
             || (get_simple_tag_name(*static_cast<KaxTagSimple *>(tag[i])) == "COMMENTS")))
       out.puts(boost::format("%1%REM \"%2%\"\n") % prefix % get_simple_tag_value(*static_cast<KaxTagSimple *>(tag[i])));
diff --git a/src/extract/timecodes_v2.cpp b/src/extract/timecodes_v2.cpp
index 566e2361b..affb80722 100644
--- a/src/extract/timecodes_v2.cpp
+++ b/src/extract/timecodes_v2.cpp
@@ -103,7 +103,7 @@ create_timecode_files(KaxTracks &kax_tracks,
     int track_number     = -1;
     KaxTrackEntry *track = nullptr;
     for (i = 0; kax_tracks.ListSize() > i; ++i) {
-      if (!is_id(kax_tracks[i], KaxTrackEntry))
+      if (!Is<KaxTrackEntry>(kax_tracks[i]))
         continue;
 
       ++track_number;
@@ -219,7 +219,7 @@ extract_timecodes(const std::string &file_name,
         show_error(Y("No segment/level 0 element found."));
         return;
       }
-      if (EbmlId(*l0) == EBML_ID(KaxSegment)) {
+      if (Is<KaxSegment>(l0)) {
         show_element(l0, 0, Y("Segment"));
         break;
       }
@@ -238,14 +238,14 @@ extract_timecodes(const std::string &file_name,
     EbmlElement *l3   = nullptr;
 
     while (l1 && (0 >= upper_lvl_el)) {
-      if (EbmlId(*l1) == EBML_ID(KaxInfo)) {
+      if (Is<KaxInfo>(l1)) {
         // General info about this Matroska file
         show_element(l1, 1, Y("Segment information"));
 
         upper_lvl_el = 0;
         l2           = es->FindNextElement(EBML_CONTEXT(l1), upper_lvl_el, 0xFFFFFFFFL, true, 1);
         while (l2 && (0 >= upper_lvl_el)) {
-          if (EbmlId(*l2) == EBML_ID(KaxTimecodeScale)) {
+          if (Is<KaxTimecodeScale>(l2)) {
             KaxTimecodeScale &ktc_scale = *static_cast<KaxTimecodeScale *>(l2);
             ktc_scale.ReadData(es->I_O());
             tc_scale = ktc_scale.GetValue();
@@ -270,7 +270,7 @@ extract_timecodes(const std::string &file_name,
           l2 = es->FindNextElement(EBML_CONTEXT(l1), upper_lvl_el, 0xFFFFFFFFL, true);
         }
 
-      } else if ((EbmlId(*l1) == EBML_ID(KaxTracks)) && !tracks_found) {
+      } else if ((Is<KaxTracks>(l1)) && !tracks_found) {
 
         // Yep, we've found our KaxTracks element. Now find all tracks
         // contained in this segment.
@@ -281,7 +281,7 @@ extract_timecodes(const std::string &file_name,
         find_and_verify_track_uids(*dynamic_cast<KaxTracks *>(l1), tspecs);
         create_timecode_files(*dynamic_cast<KaxTracks *>(l1), tspecs, version);
 
-      } else if (EbmlId(*l1) == EBML_ID(KaxCluster)) {
+      } else if (Is<KaxCluster>(l1)) {
         show_element(l1, 1, Y("Cluster"));
         KaxCluster *cluster = (KaxCluster *)l1;
         uint64_t cluster_tc = 0;
@@ -293,20 +293,20 @@ extract_timecodes(const std::string &file_name,
         l2           = es->FindNextElement(EBML_CONTEXT(l1), upper_lvl_el, 0xFFFFFFFFL, true, 1);
         while (l2 && (0 >= upper_lvl_el)) {
 
-          if (EbmlId(*l2) == EBML_ID(KaxClusterTimecode)) {
+          if (Is<KaxClusterTimecode>(l2)) {
             KaxClusterTimecode &ctc = *static_cast<KaxClusterTimecode *>(l2);
             ctc.ReadData(es->I_O());
             cluster_tc = ctc.GetValue();
             show_element(l2, 2, boost::format(Y("Cluster timecode: %|1$.3f|s")) % ((float)cluster_tc * (float)tc_scale / 1000000000.0));
             cluster->InitTimecode(cluster_tc, tc_scale);
 
-          } else if (EbmlId(*l2) == EBML_ID(KaxBlockGroup)) {
+          } else if (Is<KaxBlockGroup>(l2)) {
             show_element(l2, 2, Y("Block group"));
 
             l2->Read(*es, EBML_CLASS_CONTEXT(KaxBlockGroup), upper_lvl_el, l3, true);
             handle_blockgroup(*static_cast<KaxBlockGroup *>(l2), *cluster, tc_scale);
 
-          } else if (EbmlId(*l2) == EBML_ID(KaxSimpleBlock)) {
+          } else if (Is<KaxSimpleBlock>(l2)) {
             show_element(l2, 2, Y("Simple block"));
 
             l2->Read(*es, EBML_CLASS_CONTEXT(KaxSimpleBlock), upper_lvl_el, l3, true);
diff --git a/src/extract/tracks.cpp b/src/extract/tracks.cpp
index f2ffc5b8f..7a459ba9a 100644
--- a/src/extract/tracks.cpp
+++ b/src/extract/tracks.cpp
@@ -53,7 +53,7 @@ create_extractors(KaxTracks &kax_tracks,
   int64_t track_id = -1;
 
   for (i = 0; i < kax_tracks.ListSize(); i++) {
-    if (!is_id(kax_tracks[i], KaxTrackEntry))
+    if (!Is<KaxTrackEntry>(kax_tracks[i]))
       continue;
 
     ++track_id;
@@ -374,7 +374,7 @@ extract_tracks(const std::string &file_name,
         return false;
       }
 
-      if (EbmlId(*l0) == EBML_ID(KaxSegment)) {
+      if (Is<KaxSegment>(l0)) {
         show_element(l0, 0, Y("Segment"));
         break;
       }
@@ -391,7 +391,7 @@ extract_tracks(const std::string &file_name,
     KaxTags all_tags;
 
     while ((l1 = file->read_next_level1_element())) {
-      if (EbmlId(*l1) == EBML_ID(KaxInfo)) {
+      if (Is<KaxInfo>(l1)) {
         // General info about this Matroska file
         show_element(l1, 1, Y("Segment information"));
 
@@ -402,7 +402,7 @@ extract_tracks(const std::string &file_name,
           show_element(ktc_scale, 2, boost::format(Y("Timecode scale: %1%")) % tc_scale);
         }
 
-      } else if ((EbmlId(*l1) == EBML_ID(KaxTracks)) && !tracks_found) {
+      } else if ((Is<KaxTracks>(l1)) && !tracks_found) {
 
         // Yep, we've found our KaxTracks element. Now find all tracks
         // contained in this segment.
@@ -412,7 +412,7 @@ extract_tracks(const std::string &file_name,
         find_and_verify_track_uids(*dynamic_cast<KaxTracks *>(l1), tspecs);
         create_extractors(*dynamic_cast<KaxTracks *>(l1), tspecs);
 
-      } else if (EbmlId(*l1) == EBML_ID(KaxCluster)) {
+      } else if (Is<KaxCluster>(l1)) {
         show_element(l1, 1, Y("Cluster"));
         KaxCluster *cluster = static_cast<KaxCluster *>(l1);
 
@@ -434,11 +434,11 @@ extract_tracks(const std::string &file_name,
           int64_t max_bg_timecode = -1;
           EbmlElement *el         = (*cluster)[i];
 
-          if (EbmlId(*el) == EBML_ID(KaxBlockGroup)) {
+          if (Is<KaxBlockGroup>(el)) {
             show_element(el, 2, Y("Block group"));
             max_bg_timecode = handle_blockgroup(*static_cast<KaxBlockGroup *>(el), *cluster, tc_scale);
 
-          } else if (EbmlId(*el) == EBML_ID(KaxSimpleBlock)) {
+          } else if (Is<KaxSimpleBlock>(el)) {
             show_element(el, 2, Y("SimpleBlock"));
             max_bg_timecode = handle_simpleblock(*static_cast<KaxSimpleBlock *>(el), *cluster);
           }
@@ -449,14 +449,14 @@ extract_tracks(const std::string &file_name,
         if (-1 != max_timecode)
           file->set_last_timecode(max_timecode);
 
-      } else if (EbmlId(*l1) == EBML_ID(KaxChapters)) {
+      } else if (Is<KaxChapters>(l1)) {
         KaxChapters &chapters = *static_cast<KaxChapters *>(l1);
 
         while (chapters.ListSize() > 0) {
-          if (EbmlId(*chapters[0]) == EBML_ID(KaxEditionEntry)) {
+          if (Is<KaxEditionEntry>(chapters[0])) {
             KaxEditionEntry &entry = *static_cast<KaxEditionEntry *>(chapters[0]);
             while (entry.ListSize() > 0) {
-              if (EbmlId(*entry[0]) == EBML_ID(KaxChapterAtom))
+              if (Is<KaxChapterAtom>(entry[0]))
                 all_chapters.PushElement(*entry[0]);
               entry.Remove(0);
             }
@@ -464,7 +464,7 @@ extract_tracks(const std::string &file_name,
           chapters.Remove(0);
         }
 
-      } else if (EbmlId(*l1) == EBML_ID(KaxTags)) {
+      } else if (Is<KaxTags>(l1)) {
         KaxTags &tags = *static_cast<KaxTags *>(l1);
 
         while (tags.ListSize() > 0) {
diff --git a/src/info/mkvinfo.cpp b/src/info/mkvinfo.cpp
index ebd62267e..c2641c681 100644
--- a/src/info/mkvinfo.cpp
+++ b/src/info/mkvinfo.cpp
@@ -372,11 +372,11 @@ bool
 is_global(EbmlStream *es,
           EbmlElement *l,
           int level) {
-  if (is_id(l, EbmlVoid)) {
+  if (Is<EbmlVoid>(l)) {
     show_element(l, level, (BF_EBMLVOID % (l->ElementSize() - l->HeadSize())).str());
     return true;
 
-  } else if (is_id(l, EbmlCrc32)) {
+  } else if (Is<EbmlCrc32>(l)) {
     show_element(l, level, "EbmlCrc32");
     return true;
   }
@@ -452,13 +452,13 @@ handle_chaptertranslate(EbmlStream *&es,
   show_element(l2, 2, Y("Chapter Translate"));
 
   for (auto l3 : *static_cast<EbmlMaster *>(l2))
-    if (is_id(l3, KaxChapterTranslateEditionUID))
+    if (Is<KaxChapterTranslateEditionUID>(l3))
       show_element(l3, 3, boost::format(Y("Chapter Translate Edition UID: %1%")) % static_cast<KaxChapterTranslateEditionUID *>(l3)->GetValue());
 
-    else if (is_id(l3, KaxChapterTranslateCodec))
+    else if (Is<KaxChapterTranslateCodec>(l3))
       show_element(l3, 3, boost::format(Y("Chapter Translate Codec: %1%"))       % static_cast<KaxChapterTranslateCodec *>(l3)->GetValue());
 
-    else if (is_id(l3, KaxChapterTranslateID))
+    else if (Is<KaxChapterTranslateID>(l3))
       show_element(l3, 3, boost::format(Y("Chapter Translate ID: %1%"))          % format_binary(static_cast<EbmlBinary *>(l3)));
 }
 
@@ -477,24 +477,24 @@ handle_info(EbmlStream *&es,
   s_tc_scale = FindChildValue<KaxTimecodeScale, uint64_t>(m1, TIMECODE_SCALE);
 
   for (auto l2 : *m1)
-    if (is_id(l2, KaxTimecodeScale)) {
+    if (Is<KaxTimecodeScale>(l2)) {
       s_tc_scale = static_cast<KaxTimecodeScale *>(l2)->GetValue();
       show_element(l2, 2, boost::format(Y("Timecode scale: %1%")) % s_tc_scale);
 
-    } else if (is_id(l2, KaxDuration)) {
+    } else if (Is<KaxDuration>(l2)) {
       KaxDuration &duration = *static_cast<KaxDuration *>(l2);
       show_element(l2, 2,
                    boost::format(Y("Duration: %|1$.3f|s (%2%)"))
                    % (duration.GetValue() * s_tc_scale / 1000000000.0)
                    % format_timecode(static_cast<uint64_t>(duration.GetValue()) * s_tc_scale, 3));
 
-    } else if (is_id(l2, KaxMuxingApp))
+    } else if (Is<KaxMuxingApp>(l2))
       show_element(l2, 2, boost::format(Y("Muxing application: %1%")) % static_cast<KaxMuxingApp *>(l2)->GetValueUTF8());
 
-    else if (is_id(l2, KaxWritingApp))
+    else if (Is<KaxWritingApp>(l2))
       show_element(l2, 2, boost::format(Y("Writing application: %1%")) % static_cast<KaxWritingApp *>(l2)->GetValueUTF8());
 
-    else if (is_id(l2, KaxDateUTC)) {
+    else if (Is<KaxDateUTC>(l2)) {
       struct tm tmutc;
       char buffer[40];
       time_t temptime = static_cast<KaxDateUTC *>(l2)->GetEpochDate();
@@ -504,31 +504,31 @@ handle_info(EbmlStream *&es,
       } else
         show_element(l2, 2, boost::format(Y("Date (invalid, value: %1%)")) % temptime);
 
-    } else if (is_id(l2, KaxSegmentUID))
+    } else if (Is<KaxSegmentUID>(l2))
       show_element(l2, 2, boost::format(Y("Segment UID: %1%"))             % to_hex(static_cast<KaxSegmentUID *>(l2)));
 
-    else if (is_id(l2, KaxSegmentFamily))
+    else if (Is<KaxSegmentFamily>(l2))
       show_element(l2, 2, boost::format(Y("Family UID: %1%"))              % to_hex(static_cast<KaxSegmentFamily *>(l2)));
 
-    else if (is_id(l2, KaxChapterTranslate))
+    else if (Is<KaxChapterTranslate>(l2))
       handle_chaptertranslate(es, l2);
 
-    else if (is_id(l2, KaxPrevUID))
+    else if (Is<KaxPrevUID>(l2))
       show_element(l2, 2, boost::format(Y("Previous segment UID: %1%"))    % to_hex(static_cast<KaxPrevUID *>(l2)));
 
-    else if (is_id(l2, KaxPrevFilename))
+    else if (Is<KaxPrevFilename>(l2))
       show_element(l2, 2, boost::format(Y("Previous filename: %1%"))       % static_cast<KaxPrevFilename *>(l2)->GetValueUTF8());
 
-    else if (is_id(l2, KaxNextUID))
+    else if (Is<KaxNextUID>(l2))
       show_element(l2, 2, boost::format(Y("Next segment UID: %1%"))        % to_hex(static_cast<KaxNextUID *>(l2)));
 
-    else if (is_id(l2, KaxNextFilename))
+    else if (Is<KaxNextFilename>(l2))
       show_element(l2, 2, boost::format(Y("Next filename: %1%"))           % static_cast<KaxNextFilename *>(l2)->GetValueUTF8());
 
-    else if (is_id(l2, KaxSegmentFilename))
+    else if (Is<KaxSegmentFilename>(l2))
       show_element(l2, 2, boost::format(Y("Segment filename: %1%"))        % static_cast<KaxSegmentFilename *>(l2)->GetValueUTF8());
 
-    else if (is_id(l2, KaxTitle))
+    else if (Is<KaxTitle>(l2))
       show_element(l2, 2, boost::format(Y("Title: %1%"))                   % static_cast<KaxTitle *>(l2)->GetValueUTF8());
 }
 
@@ -539,28 +539,28 @@ handle_audio_track(EbmlStream *&es,
   show_element(l3, 3, "Audio track");
 
   for (auto l4 : *static_cast<EbmlMaster *>(l3))
-    if (is_id(l4, KaxAudioSamplingFreq)) {
+    if (Is<KaxAudioSamplingFreq>(l4)) {
       KaxAudioSamplingFreq &freq = *static_cast<KaxAudioSamplingFreq *>(l4);
       show_element(l4, 4, boost::format(Y("Sampling frequency: %1%")) % freq.GetValue());
       summary.push_back((boost::format(Y("sampling freq: %1%")) % freq.GetValue()).str());
 
-    } else if (is_id(l4, KaxAudioOutputSamplingFreq)) {
+    } else if (Is<KaxAudioOutputSamplingFreq>(l4)) {
       KaxAudioOutputSamplingFreq &ofreq = *static_cast<KaxAudioOutputSamplingFreq *>(l4);
       show_element(l4, 4, boost::format(Y("Output sampling frequency: %1%")) % ofreq.GetValue());
       summary.push_back((boost::format(Y("output sampling freq: %1%")) % ofreq.GetValue()).str());
 
-    } else if (is_id(l4, KaxAudioChannels)) {
+    } else if (Is<KaxAudioChannels>(l4)) {
       KaxAudioChannels &channels = *static_cast<KaxAudioChannels *>(l4);
       show_element(l4, 4, boost::format(Y("Channels: %1%")) % channels.GetValue());
       summary.push_back((boost::format(Y("channels: %1%")) % channels.GetValue()).str());
 
 #if MATROSKA_VERSION >= 2
-    } else if (is_id(l4, KaxAudioPosition)) {
+    } else if (Is<KaxAudioPosition>(l4)) {
       KaxAudioPosition &positions = *static_cast<KaxAudioPosition *>(l4);
       show_element(l4, 4, boost::format(Y("Channel positions: %1%")) % format_binary(positions));
 #endif
 
-    } else if (is_id(l4, KaxAudioBitDepth)) {
+    } else if (Is<KaxAudioBitDepth>(l4)) {
       KaxAudioBitDepth &bps = *static_cast<KaxAudioBitDepth *>(l4);
       show_element(l4, 4, boost::format(Y("Bit depth: %1%")) % bps.GetValue());
       summary.push_back((boost::format(Y("bits per sample: %1%")) % bps.GetValue()).str());
@@ -576,48 +576,48 @@ handle_video_track(EbmlStream *&es,
   show_element(l3, 3, Y("Video track"));
 
   for (auto l4 : *static_cast<EbmlMaster *>(l3))
-    if (is_id(l4, KaxVideoPixelWidth)) {
+    if (Is<KaxVideoPixelWidth>(l4)) {
       KaxVideoPixelWidth &width = *static_cast<KaxVideoPixelWidth *>(l4);
       show_element(l4, 4, boost::format(Y("Pixel width: %1%")) % width.GetValue());
       summary.push_back((boost::format(Y("pixel width: %1%")) % width.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoPixelHeight)) {
+    } else if (Is<KaxVideoPixelHeight>(l4)) {
       KaxVideoPixelHeight &height = *static_cast<KaxVideoPixelHeight *>(l4);
       show_element(l4, 4, boost::format(Y("Pixel height: %1%")) % height.GetValue());
       summary.push_back((boost::format(Y("pixel height: %1%")) % height.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoDisplayWidth)) {
+    } else if (Is<KaxVideoDisplayWidth>(l4)) {
       KaxVideoDisplayWidth &width = *static_cast<KaxVideoDisplayWidth *>(l4);
       show_element(l4, 4, boost::format(Y("Display width: %1%")) % width.GetValue());
       summary.push_back((boost::format(Y("display width: %1%")) % width.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoDisplayHeight)) {
+    } else if (Is<KaxVideoDisplayHeight>(l4)) {
       KaxVideoDisplayHeight &height = *static_cast<KaxVideoDisplayHeight *>(l4);
       show_element(l4, 4, boost::format(Y("Display height: %1%")) % height.GetValue());
       summary.push_back((boost::format(Y("display height: %1%")) % height.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoPixelCropLeft)) {
+    } else if (Is<KaxVideoPixelCropLeft>(l4)) {
       KaxVideoPixelCropLeft &left = *static_cast<KaxVideoPixelCropLeft *>(l4);
       show_element(l4, 4, boost::format(Y("Pixel crop left: %1%")) % left.GetValue());
       summary.push_back((boost::format(Y("pixel crop left: %1%")) % left.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoPixelCropTop)) {
+    } else if (Is<KaxVideoPixelCropTop>(l4)) {
       KaxVideoPixelCropTop &top = *static_cast<KaxVideoPixelCropTop *>(l4);
       show_element(l4, 4, boost::format(Y("Pixel crop top: %1%")) % top.GetValue());
       summary.push_back((boost::format(Y("pixel crop top: %1%")) % top.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoPixelCropRight)) {
+    } else if (Is<KaxVideoPixelCropRight>(l4)) {
       KaxVideoPixelCropRight &right = *static_cast<KaxVideoPixelCropRight *>(l4);
       show_element(l4, 4, boost::format(Y("Pixel crop right: %1%")) % right.GetValue());
       summary.push_back((boost::format(Y("pixel crop right: %1%")) % right.GetValue()).str());
 
-    } else if (is_id(l4, KaxVideoPixelCropBottom)) {
+    } else if (Is<KaxVideoPixelCropBottom>(l4)) {
       KaxVideoPixelCropBottom &bottom = *static_cast<KaxVideoPixelCropBottom *>(l4);
       show_element(l4, 4, boost::format(Y("Pixel crop bottom: %1%")) % bottom.GetValue());
       summary.push_back((boost::format(Y("pixel crop bottom: %1%")) % bottom.GetValue()).str());
 
 #if MATROSKA_VERSION >= 2
-    } else if (is_id(l4, KaxVideoDisplayUnit)) {
+    } else if (Is<KaxVideoDisplayUnit>(l4)) {
       auto unit = static_cast<KaxVideoDisplayUnit *>(l4)->GetValue();
       show_element(l4, 4,
                    boost::format(Y("Display unit: %1%%2%"))
@@ -628,20 +628,20 @@ handle_video_track(EbmlStream *&es,
                       : 3 == unit ? Y(" (aspect ratio)")
                       :               ""));
 
-    } else if (is_id(l4, KaxVideoGamma))
+    } else if (Is<KaxVideoGamma>(l4))
       show_element(l4, 4, boost::format(Y("Gamma: %1%")) % static_cast<KaxVideoGamma *>(l4)->GetValue());
 
-    else if (is_id(l4, KaxVideoFlagInterlaced))
+    else if (Is<KaxVideoFlagInterlaced>(l4))
       show_element(l4, 4, boost::format(Y("Interlaced: %1%")) % static_cast<KaxVideoFlagInterlaced *>(l4)->GetValue());
 
-    else if (is_id(l4, KaxVideoStereoMode)) {
+    else if (Is<KaxVideoStereoMode>(l4)) {
       auto stereo_mode = static_cast<KaxVideoStereoMode *>(l4)->GetValue();
       show_element(l4, 4,
                    boost::format(Y("Stereo mode: %1% (%2%)"))
                    % stereo_mode
                    % stereo_mode_c::translate(static_cast<stereo_mode_c::mode>(stereo_mode)));
 
-    } else if (is_id(l4, KaxVideoAspectRatio)) {
+    } else if (Is<KaxVideoAspectRatio>(l4)) {
       auto ar_type = static_cast<KaxVideoAspectRatio *>(l4)->GetValue();
       show_element(l4, 4,
                    boost::format(Y("Aspect ratio type: %1%%2%"))
@@ -651,10 +651,10 @@ handle_video_track(EbmlStream *&es,
                       : 2 == ar_type ? Y(" (fixed)")
                       :                  ""));
 #endif
-    } else if (is_id(l4, KaxVideoColourSpace))
+    } else if (Is<KaxVideoColourSpace>(l4))
       show_element(l4, 4, boost::format(Y("Colour space: %1%")) % format_binary(static_cast<KaxVideoColourSpace *>(l4)));
 
-    else if (is_id(l4, KaxVideoFrameRate))
+    else if (Is<KaxVideoFrameRate>(l4))
       show_element(l4, 4, boost::format(Y("Frame rate: %1%")) % static_cast<KaxVideoFrameRate *>(l4)->GetValue());
 
     else if (!is_global(es, l4, 4))
@@ -667,14 +667,14 @@ handle_content_encodings(EbmlStream *&es,
   show_element(l3, 3, Y("Content encodings"));
 
   for (auto l4 : *static_cast<EbmlMaster *>(l3))
-    if (is_id(l4, KaxContentEncoding)) {
+    if (Is<KaxContentEncoding>(l4)) {
       show_element(l4, 4, Y("Content encoding"));
 
       for (auto l5 : *static_cast<EbmlMaster *>(l4))
-        if (is_id(l5, KaxContentEncodingOrder))
+        if (Is<KaxContentEncodingOrder>(l5))
           show_element(l5, 5, boost::format(Y("Order: %1%")) % static_cast<KaxContentEncodingOrder *>(l5)->GetValue());
 
-        else if (is_id(l5,  KaxContentEncodingScope)) {
+        else if (Is<KaxContentEncodingScope>(l5)) {
           std::vector<std::string> scope;
           auto ce_scope = static_cast<KaxContentEncodingScope *>(l5)->GetValue();
 
@@ -688,7 +688,7 @@ handle_content_encodings(EbmlStream *&es,
             scope.push_back(Y("unknown"));
           show_element(l5, 5, boost::format(Y("Scope: %1% (%2%)")) % ce_scope % join(", ", scope));
 
-        } else if (is_id(l5,  KaxContentEncodingType)) {
+        } else if (Is<KaxContentEncodingType>(l5)) {
           auto ce_type = static_cast<KaxContentEncodingType *>(l5)->GetValue();
           show_element(l5, 5,
                        boost::format(Y("Type: %1% (%2%)"))
@@ -697,11 +697,11 @@ handle_content_encodings(EbmlStream *&es,
                           : 1 == ce_type ? Y("encryption")
                           :                Y("unknown")));
 
-        } else if (is_id(l5, KaxContentCompression)) {
+        } else if (Is<KaxContentCompression>(l5)) {
           show_element(l5, 5, Y("Content compression"));
 
           for (auto l6 : *static_cast<EbmlMaster *>(l5))
-            if (is_id(l6, KaxContentCompAlgo)) {
+            if (Is<KaxContentCompAlgo>(l6)) {
               auto c_algo = static_cast<KaxContentCompAlgo *>(l6)->GetValue();
               show_element(l6, 6,
                            boost::format(Y("Algorithm: %1% (%2%)"))
@@ -712,16 +712,16 @@ handle_content_encodings(EbmlStream *&es,
                               : 3 == c_algo ? Y("header removal")
                               :               Y("unknown")));
 
-            } else if (is_id(l6, KaxContentCompSettings))
+            } else if (Is<KaxContentCompSettings>(l6))
               show_element(l6, 6, boost::format(Y("Settings: %1%")) % format_binary(static_cast<KaxContentCompSettings *>(l6)));
 
             else if (!is_global(es, l6, 6))
               show_unknown_element(l6, 6);
-        } else if (is_id(l5, KaxContentEncryption)) {
+        } else if (Is<KaxContentEncryption>(l5)) {
           show_element(l5, 5, Y("Content encryption"));
 
           for (auto l6 : *static_cast<EbmlMaster *>(l5))
-            if (is_id(l6, KaxContentEncAlgo)) {
+            if (Is<KaxContentEncAlgo>(l6)) {
               auto e_algo = static_cast<KaxContentEncAlgo *>(l6)->GetValue();
               show_element(l6, 6,
                            boost::format(Y("Encryption algorithm: %1% (%2%)"))
@@ -734,10 +734,10 @@ handle_content_encodings(EbmlStream *&es,
                               : 5 == e_algo ?   "AES"
                               :               Y("unknown")));
 
-            } else if (is_id(l6, KaxContentEncKeyID))
+            } else if (Is<KaxContentEncKeyID>(l6))
               show_element(l6, 6, boost::format(Y("Encryption key ID: %1%")) % format_binary(static_cast<KaxContentEncKeyID *>(l6)));
 
-            else if (is_id(l6, KaxContentSigAlgo)) {
+            else if (Is<KaxContentSigAlgo>(l6)) {
               auto s_algo = static_cast<KaxContentSigAlgo *>(l6)->GetValue();
               show_element(l6, 6,
                            boost::format(Y("Signature algorithm: %1% (%2%)"))
@@ -746,7 +746,7 @@ handle_content_encodings(EbmlStream *&es,
                               : 1 == s_algo ? Y("RSA")
                               :               Y("unknown")));
 
-            } else if (is_id(l6, KaxContentSigHashAlgo)) {
+            } else if (Is<KaxContentSigHashAlgo>(l6)) {
               auto s_halgo = static_cast<KaxContentSigHashAlgo *>(l6)->GetValue();
               show_element(l6, 6,
                            boost::format(Y("Signature hash algorithm: %1% (%2%)"))
@@ -756,10 +756,10 @@ handle_content_encodings(EbmlStream *&es,
                               : 2 == s_halgo ? Y("MD5")
                               :                Y("unknown")));
 
-            } else if (is_id(l6, KaxContentSigKeyID))
+            } else if (Is<KaxContentSigKeyID>(l6))
               show_element(l6, 6, boost::format(Y("Signature key ID: %1%")) % format_binary(static_cast<KaxContentSigKeyID *>(l6)));
 
-            else if (is_id(l6, KaxContentSignature))
+            else if (Is<KaxContentSignature>(l6))
               show_element(l6, 6, boost::format(Y("Signature: %1%")) % format_binary(static_cast<KaxContentSignature *>(l6)));
 
             else if (!is_global(es, l6, 6))
@@ -787,7 +787,7 @@ handle_tracks(EbmlStream *&es,
   read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
 
   for (auto l2 : *m1)
-    if (is_id(l2, KaxTrackEntry)) {
+    if (Is<KaxTrackEntry>(l2)) {
       // We actually found a track entry :) We're happy now.
       show_element(l2, 2, Y("A track"));
 
@@ -797,13 +797,13 @@ handle_tracks(EbmlStream *&es,
 
       for (auto l3 : *static_cast<EbmlMaster *>(l2))
         // Now evaluate the data belonging to this track
-        if (is_id(l3, KaxTrackAudio))
+        if (Is<KaxTrackAudio>(l3))
           handle_audio_track(es, l3, summary);
 
-        else if (is_id(l3, KaxTrackVideo))
+        else if (Is<KaxTrackVideo>(l3))
           handle_video_track(es, l3, summary);
 
-        else if (is_id(l3, KaxTrackNumber)) {
+        else if (Is<KaxTrackNumber>(l3)) {
           track->tnum = static_cast<KaxTrackNumber *>(l3)->GetValue();
 
           auto existing_track = find_track(track->tnum);
@@ -819,11 +819,11 @@ handle_tracks(EbmlStream *&es,
           show_element(l3, 3, boost::format(Y("Track number: %1% (track ID for mkvmerge & mkvextract: %2%)")) % track->tnum % track_id);
           summary.push_back((boost::format(Y("mkvmerge/mkvextract track ID: %1%"))                            % track_id).str());
 
-        } else if (is_id(l3, KaxTrackUID)) {
+        } else if (Is<KaxTrackUID>(l3)) {
           track->tuid = static_cast<KaxTrackUID *>(l3)->GetValue();
           show_element(l3, 3, boost::format(Y("Track UID: %1%"))                                              % track->tuid);
 
-        } else if (is_id(l3, KaxTrackType)) {
+        } else if (Is<KaxTrackType>(l3)) {
           auto ttype  = static_cast<KaxTrackType *>(l3)->GetValue();
           track->type = track_audio    == ttype ? 'a'
                       : track_video    == ttype ? 'v'
@@ -839,18 +839,18 @@ handle_tracks(EbmlStream *&es,
                           :                      "unknown"));
 
 #if MATROSKA_VERSION >= 2
-        } else if (is_id(l3, KaxTrackFlagEnabled))
+        } else if (Is<KaxTrackFlagEnabled>(l3))
           show_element(l3, 3, boost::format(Y("Enabled: %1%"))                % static_cast<KaxTrackFlagEnabled *>(l3)->GetValue());
 #endif
 
-        else if (is_id(l3, KaxTrackName))
+        else if (Is<KaxTrackName>(l3))
           show_element(l3, 3, boost::format(Y("Name: %1%"))                   % static_cast<KaxTrackName *>(l3)->GetValueUTF8());
 
-        else if (is_id(l3, KaxCodecID)) {
+        else if (Is<KaxCodecID>(l3)) {
           kax_codec_id = static_cast<KaxCodecID *>(l3)->GetValue();
           show_element(l3, 3, boost::format(Y("Codec ID: %1%"))               % kax_codec_id);
 
-        } else if (is_id(l3, KaxCodecPrivate)) {
+        } else if (Is<KaxCodecPrivate>(l3)) {
           KaxCodecPrivate &c_priv = *static_cast<KaxCodecPrivate *>(l3);
           fourcc_buffer = create_codec_dependent_private_info(c_priv, track->type, kax_codec_id);
 
@@ -862,33 +862,33 @@ handle_tracks(EbmlStream *&es,
 
           show_element(l3, 3, boost::format(Y("CodecPrivate, length %1%%2%")) % c_priv.GetSize() % fourcc_buffer);
 
-        } else if (is_id(l3, KaxCodecName))
+        } else if (Is<KaxCodecName>(l3))
           show_element(l3, 3, boost::format(Y("Codec name: %1%"))             % static_cast<KaxCodecName *>(l3)->GetValueUTF8());
 
 #if MATROSKA_VERSION >= 2
-        else if (is_id(l3, KaxCodecSettings))
+        else if (Is<KaxCodecSettings>(l3))
           show_element(l3, 3, boost::format(Y("Codec settings: %1%"))         % static_cast<KaxCodecSettings *>(l3)->GetValueUTF8());
 
-        else if (is_id(l3, KaxCodecInfoURL))
+        else if (Is<KaxCodecInfoURL>(l3))
           show_element(l3, 3, boost::format(Y("Codec info URL: %1%"))         % static_cast<KaxCodecInfoURL *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxCodecDownloadURL))
+        else if (Is<KaxCodecDownloadURL>(l3))
           show_element(l3, 3, boost::format(Y("Codec download URL: %1%"))     % static_cast<KaxCodecDownloadURL *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxCodecDecodeAll))
+        else if (Is<KaxCodecDecodeAll>(l3))
           show_element(l3, 3, boost::format(Y("Codec decode all: %1%"))       % static_cast<KaxCodecDecodeAll *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxTrackOverlay))
+        else if (Is<KaxTrackOverlay>(l3))
           show_element(l3, 3, boost::format(Y("Track overlay: %1%"))          % static_cast<KaxTrackOverlay *>(l3)->GetValue());
 #endif // MATROSKA_VERSION >= 2
 
-        else if (is_id(l3, KaxTrackMinCache))
+        else if (Is<KaxTrackMinCache>(l3))
           show_element(l3, 3, boost::format(Y("MinCache: %1%"))               % static_cast<KaxTrackMinCache *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxTrackMaxCache))
+        else if (Is<KaxTrackMaxCache>(l3))
           show_element(l3, 3, boost::format(Y("MaxCache: %1%"))               % static_cast<KaxTrackMaxCache *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxTrackDefaultDuration)) {
+        else if (Is<KaxTrackDefaultDuration>(l3)) {
           track->default_duration = static_cast<KaxTrackDefaultDuration *>(l3)->GetValue();
           show_element(l3, 3,
                        boost::format(Y("Default duration: %|1$.3f|ms (%|2$.3f| frames/fields per second for a video track)"))
@@ -899,34 +899,34 @@ handle_tracks(EbmlStream *&es,
                              % (1000000000.0 / static_cast<double>(track->default_duration))
                              ).str());
 
-        } else if (is_id(l3, KaxTrackFlagLacing))
+        } else if (Is<KaxTrackFlagLacing>(l3))
           show_element(l3, 3, boost::format(Y("Lacing flag: %1%"))          % static_cast<KaxTrackFlagLacing *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxTrackFlagDefault))
+        else if (Is<KaxTrackFlagDefault>(l3))
           show_element(l3, 3, boost::format(Y("Default flag: %1%"))         % static_cast<KaxTrackFlagDefault *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxTrackFlagForced))
+        else if (Is<KaxTrackFlagForced>(l3))
           show_element(l3, 3, boost::format(Y("Forced flag: %1%"))          % static_cast<KaxTrackFlagForced *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxTrackLanguage)) {
+        else if (Is<KaxTrackLanguage>(l3)) {
           auto language = static_cast<KaxTrackLanguage *>(l3)->GetValue();
           show_element(l3, 3, boost::format(Y("Language: %1%"))             % language);
           summary.push_back((boost::format(Y("language: %1%"))              % language).str());
 
-        } else if (is_id(l3, KaxTrackTimecodeScale))
+        } else if (Is<KaxTrackTimecodeScale>(l3))
           show_element(l3, 3, boost::format(Y("Timecode scale: %1%"))       % static_cast<KaxTrackTimecodeScale *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxMaxBlockAdditionID))
+        else if (Is<KaxMaxBlockAdditionID>(l3))
           show_element(l3, 3, boost::format(Y("Max BlockAddition ID: %1%")) % static_cast<KaxMaxBlockAdditionID *>(l3)->GetValue());
 
-        else if (is_id(l3, KaxContentEncodings))
+        else if (Is<KaxContentEncodings>(l3))
           handle_content_encodings(es, l3);
 
-        else if (is_id(l3, KaxCodecDelay)) {
+        else if (Is<KaxCodecDelay>(l3)) {
           auto value = static_cast<KaxCodecDelay *>(l3)->GetValue();
           show_element(l3, 3, boost::format(Y("Codec delay: %|1$.3f|ms (%2%ns)")) % (static_cast<double>(value) / 1000000.0) % value);
 
-        } else if (is_id(l3, KaxSeekPreRoll)) {
+        } else if (Is<KaxSeekPreRoll>(l3)) {
           auto value = static_cast<KaxSeekPreRoll *>(l3)->GetValue();
           show_element(l3, 3, boost::format(Y("Seek pre-roll: %|1$.3f|ms (%2%ns)")) % (static_cast<double>(value) / 1000000.0) % value);
 
@@ -967,28 +967,28 @@ handle_seek_head(EbmlStream *&es,
   read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
 
   for (auto l2 : *m1)
-    if (is_id(l2, KaxSeek)) {
+    if (Is<KaxSeek>(l2)) {
       show_element(l2, 2, Y("Seek entry"));
 
       for (auto l3 : *static_cast<EbmlMaster *>(l2))
-        if (is_id(l3, KaxSeekID)) {
+        if (Is<KaxSeekID>(l3)) {
           KaxSeekID &seek_id = static_cast<KaxSeekID &>(*l3);
           EbmlId id(seek_id.GetBuffer(), seek_id.GetSize());
 
           show_element(l3, 3,
                        boost::format(Y("Seek ID: %1% (%2%)"))
                        % to_hex(seek_id)
-                       % (  EBML_ID(KaxInfo)        == id ? "KaxInfo"
-                          : EBML_ID(KaxCluster)     == id ? "KaxCluster"
-                          : EBML_ID(KaxTracks)      == id ? "KaxTracks"
-                          : EBML_ID(KaxCues)        == id ? "KaxCues"
-                          : EBML_ID(KaxAttachments) == id ? "KaxAttachments"
-                          : EBML_ID(KaxChapters)    == id ? "KaxChapters"
-                          : EBML_ID(KaxTags)        == id ? "KaxTags"
-                          : EBML_ID(KaxSeekHead)    == id ? "KaxSeekHead"
-                          :                                 "unknown"));
+                       % (  Is<KaxInfo>(id)        ? "KaxInfo"
+                          : Is<KaxCluster>(id)     ? "KaxCluster"
+                          : Is<KaxTracks>(id)      ? "KaxTracks"
+                          : Is<KaxCues>(id)        ? "KaxCues"
+                          : Is<KaxAttachments>(id) ? "KaxAttachments"
+                          : Is<KaxChapters>(id)    ? "KaxChapters"
+                          : Is<KaxTags>(id)        ? "KaxTags"
+                          : Is<KaxSeekHead>(id)    ? "KaxSeekHead"
+                          :                          "unknown"));
 
-        } else if (is_id(l3, KaxSeekPosition))
+        } else if (Is<KaxSeekPosition>(l3))
           show_element(l3, 3, boost::format(Y("Seek position: %1%")) % static_cast<KaxSeekPosition *>(l3)->GetValue());
 
         else if (!is_global(es, l3, 3))
@@ -1015,50 +1015,50 @@ handle_cues(EbmlStream *&es,
   read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
 
   for (auto l2 : *m1)
-    if (is_id(l2, KaxCuePoint)) {
+    if (Is<KaxCuePoint>(l2)) {
       show_element(l2, 2, Y("Cue point"));
 
       for (auto l3 : *static_cast<EbmlMaster *>(l2))
-        if (is_id(l3, KaxCueTime))
+        if (Is<KaxCueTime>(l3))
           show_element(l3, 3, boost::format(Y("Cue time: %|1$.3f|s")) % (s_tc_scale * static_cast<double>(static_cast<KaxCueTime *>(l3)->GetValue()) / 1000000000.0));
 
-        else if (is_id(l3, KaxCueTrackPositions)) {
+        else if (Is<KaxCueTrackPositions>(l3)) {
           show_element(l3, 3, Y("Cue track positions"));
 
           for (auto l4 : *static_cast<EbmlMaster *>(l3))
-            if (is_id(l4, KaxCueTrack))
+            if (Is<KaxCueTrack>(l4))
               show_element(l4, 4, boost::format(Y("Cue track: %1%"))            % static_cast<KaxCueTrack *>(l4)->GetValue());
 
-            else if (is_id(l4, KaxCueClusterPosition))
+            else if (Is<KaxCueClusterPosition>(l4))
               show_element(l4, 4, boost::format(Y("Cue cluster position: %1%")) % static_cast<KaxCueClusterPosition *>(l4)->GetValue());
 
-            else if (is_id(l4, KaxCueRelativePosition))
+            else if (Is<KaxCueRelativePosition>(l4))
               show_element(l4, 4, boost::format(Y("Cue relative position: %1%")) % static_cast<KaxCueRelativePosition *>(l4)->GetValue());
 
-            else if (is_id(l4, KaxCueDuration))
+            else if (Is<KaxCueDuration>(l4))
               show_element(l4, 4, boost::format(Y("Cue duration: %1%"))         % format_timecode(static_cast<KaxCueDuration *>(l4)->GetValue() * s_tc_scale));
 
-            else if (is_id(l4, KaxCueBlockNumber))
+            else if (Is<KaxCueBlockNumber>(l4))
               show_element(l4, 4, boost::format(Y("Cue block number: %1%"))     % static_cast<KaxCueBlockNumber *>(l4)->GetValue());
 
 #if MATROSKA_VERSION >= 2
-            else if (is_id(l4, KaxCueCodecState))
+            else if (Is<KaxCueCodecState>(l4))
               show_element(l4, 4, boost::format(Y("Cue codec state: %1%"))      % static_cast<KaxCueCodecState *>(l4)->GetValue());
 
-            else if (is_id(l4, KaxCueReference)) {
+            else if (Is<KaxCueReference>(l4)) {
               show_element(l4, 4, Y("Cue reference"));
 
               for (auto l5 : *static_cast<EbmlMaster *>(l4))
-                if (is_id(l5, KaxCueRefTime))
+                if (Is<KaxCueRefTime>(l5))
                   show_element(l5, 5, boost::format(Y("Cue ref time: %|1$.3f|s"))  % s_tc_scale % (static_cast<KaxCueRefTime *>(l5)->GetValue() / 1000000000.0));
 
-                else if (is_id(l5, KaxCueRefCluster))
+                else if (Is<KaxCueRefCluster>(l5))
                   show_element(l5, 5, boost::format(Y("Cue ref cluster: %1%"))     % static_cast<KaxCueRefCluster *>(l5)->GetValue());
 
-                else if (is_id(l5, KaxCueRefNumber))
+                else if (Is<KaxCueRefNumber>(l5))
                   show_element(l5, 5, boost::format(Y("Cue ref number: %1%"))      % static_cast<KaxCueRefNumber *>(l5)->GetValue());
 
-                else if (is_id(l5, KaxCueRefCodecState))
+                else if (Is<KaxCueRefCodecState>(l5))
                   show_element(l5, 5, boost::format(Y("Cue ref codec state: %1%")) % static_cast<KaxCueRefCodecState *>(l5)->GetValue());
 
                 else if (!is_global(es, l5, 5))
@@ -1088,23 +1088,23 @@ handle_attachments(EbmlStream *&es,
   read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
 
   for (auto l2 : *m1)
-    if (is_id(l2, KaxAttached)) {
+    if (Is<KaxAttached>(l2)) {
       show_element(l2, 2, Y("Attached"));
 
       for (auto l3 : *static_cast<EbmlMaster *>(l2))
-        if (is_id(l3, KaxFileDescription))
+        if (Is<KaxFileDescription>(l3))
           show_element(l3, 3, boost::format(Y("File description: %1%")) % static_cast<KaxFileDescription *>(l3)->GetValueUTF8());
 
-         else if (is_id(l3, KaxFileName))
+         else if (Is<KaxFileName>(l3))
           show_element(l3, 3, boost::format(Y("File name: %1%"))        % static_cast<KaxFileName *>(l3)->GetValueUTF8());
 
-         else if (is_id(l3, KaxMimeType))
+         else if (Is<KaxMimeType>(l3))
            show_element(l3, 3, boost::format(Y("Mime type: %1%"))       % static_cast<KaxMimeType *>(l3)->GetValue());
 
-         else if (is_id(l3, KaxFileData))
+         else if (Is<KaxFileData>(l3))
           show_element(l3, 3, boost::format(Y("File data, size: %1%"))  % static_cast<KaxFileData *>(l3)->GetSize());
 
-         else if (is_id(l3, KaxFileUID))
+         else if (Is<KaxFileUID>(l3))
            show_element(l3, 3, boost::format(Y("File UID: %1%"))        % static_cast<KaxFileUID *>(l3)->GetValue());
 
          else if (!is_global(es, l3, 3))
@@ -1120,7 +1120,7 @@ handle_silent_track(EbmlStream *&es,
   show_element(l2, 2, "Silent Tracks");
 
   for (auto l3 : *static_cast<EbmlMaster *>(l2))
-    if (is_id(l3, KaxClusterSilentTrackNumber))
+    if (Is<KaxClusterSilentTrackNumber>(l3))
       show_element(l3, 3, boost::format(Y("Silent Track Number: %1%")) % static_cast<KaxClusterSilentTrackNumber *>(l3)->GetValue());
 
     else if (!is_global(es, l3, 3))
@@ -1147,7 +1147,7 @@ handle_block_group(EbmlStream *&es,
   float bduration     = -1.0;
 
   for (auto l3 : *static_cast<EbmlMaster *>(l2))
-    if (is_id(l3, KaxBlock)) {
+    if (Is<KaxBlock>(l3)) {
       KaxBlock &block = *static_cast<KaxBlock *>(l3);
       block.SetParent(*cluster);
       show_element(l3, 3,
@@ -1182,12 +1182,12 @@ handle_block_group(EbmlStream *&es,
         frame_pos -= data.Size();
       }
 
-    } else if (is_id(l3, KaxBlockDuration)) {
+    } else if (Is<KaxBlockDuration>(l3)) {
       auto duration = static_cast<KaxBlockDuration *>(l3)->GetValue();
       bduration     = static_cast<double>(duration) * s_tc_scale / 1000000.0;
       show_element(l3, 3, BF_BLOCK_GROUP_DURATION % (duration * s_tc_scale / 1000000) % (duration * s_tc_scale % 1000000));
 
-    } else if (is_id(l3, KaxReferenceBlock)) {
+    } else if (Is<KaxReferenceBlock>(l3)) {
       int64_t reference = static_cast<KaxReferenceBlock *>(l3)->GetValue() * s_tc_scale;
 
       if (0 >= reference) {
@@ -1200,37 +1200,37 @@ handle_block_group(EbmlStream *&es,
         show_element(l3, 3, BF_BLOCK_GROUP_REFERENCE_2 % (reference / 1000000) % (reference % 1000000));
       }
 
-    } else if (is_id(l3, KaxReferencePriority))
+    } else if (Is<KaxReferencePriority>(l3))
       show_element(l3, 3, BF_BLOCK_GROUP_REFERENCE_PRIORITY % static_cast<KaxReferencePriority *>(l3)->GetValue());
 
 #if MATROSKA_VERSION >= 2
-    else if (is_id(l3, KaxBlockVirtual))
+    else if (Is<KaxBlockVirtual>(l3))
       show_element(l3, 3, BF_BLOCK_GROUP_VIRTUAL            % format_binary(static_cast<KaxBlockVirtual *>(l3)));
 
-    else if (is_id(l3, KaxReferenceVirtual))
+    else if (Is<KaxReferenceVirtual>(l3))
       show_element(l3, 3, BF_BLOCK_GROUP_REFERENCE_VIRTUAL  % static_cast<KaxReferenceVirtual *>(l3)->GetValue());
 
-    else if (is_id(l3, KaxCodecState))
+    else if (Is<KaxCodecState>(l3))
       show_element(l3, 3, BF_CODEC_STATE                    % format_binary(static_cast<KaxCodecState *>(l3)));
 
-    else if (is_id(l3, KaxDiscardPadding)) {
+    else if (Is<KaxDiscardPadding>(l3)) {
       auto value = static_cast<KaxDiscardPadding *>(l3)->GetValue();
       show_element(l3, 3, BF_BLOCK_GROUP_DISCARD_PADDING    % (static_cast<double>(value) / 1000000.0) % value);
     }
 
 #endif // MATROSKA_VERSION >= 2
-    else if (is_id(l3, KaxBlockAdditions)) {
+    else if (Is<KaxBlockAdditions>(l3)) {
       show_element(l3, 3, Y("Additions"));
 
       for (auto l4 : *static_cast<EbmlMaster *>(l3))
-        if (is_id(l4, KaxBlockMore)) {
+        if (Is<KaxBlockMore>(l4)) {
           show_element(l4, 4, Y("More"));
 
           for (auto l5 : *static_cast<EbmlMaster *>(l4))
-            if (is_id(l5, KaxBlockAddID))
+            if (Is<KaxBlockAddID>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_ADD_ID     % static_cast<KaxBlockAddID *>(l5)->GetValue());
 
-            else if (is_id(l5, KaxBlockAdditional))
+            else if (Is<KaxBlockAdditional>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_ADDITIONAL % format_binary(static_cast<KaxBlockAdditional *>(l5)));
 
             else if (!is_global(es, l5, 5))
@@ -1239,27 +1239,27 @@ handle_block_group(EbmlStream *&es,
         } else if (!is_global(es, l4, 4))
           show_unknown_element(l4, 4);
 
-    } else if (is_id(l3, KaxSlices)) {
+    } else if (Is<KaxSlices>(l3)) {
       show_element(l3, 3, Y("Slices"));
 
       for (auto l4 : *static_cast<EbmlMaster *>(l3))
-        if (is_id(l4, KaxTimeSlice)) {
+        if (Is<KaxTimeSlice>(l4)) {
           show_element(l4, 4, Y("Time slice"));
 
           for (auto l5 : *static_cast<EbmlMaster *>(l4))
-            if (is_id(l5, KaxSliceLaceNumber))
+            if (Is<KaxSliceLaceNumber>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_SLICE_LACE     % static_cast<KaxSliceLaceNumber *>(l5)->GetValue());
 
-            else if (is_id(l5, KaxSliceFrameNumber))
+            else if (Is<KaxSliceFrameNumber>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_SLICE_FRAME    % static_cast<KaxSliceFrameNumber *>(l5)->GetValue());
 
-            else if (is_id(l5, KaxSliceDelay))
+            else if (Is<KaxSliceDelay>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_SLICE_DELAY    % (static_cast<double>(static_cast<KaxSliceDelay *>(l5)->GetValue()) * s_tc_scale / 1000000.0));
 
-            else if (is_id(l5, KaxSliceDuration))
+            else if (Is<KaxSliceDuration>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_SLICE_DURATION % (static_cast<double>(static_cast<KaxSliceDuration *>(l5)->GetValue()) * s_tc_scale / 1000000.0));
 
-            else if (is_id(l5, KaxSliceBlockAddID))
+            else if (Is<KaxSliceBlockAddID>(l5))
               show_element(l5, 5, BF_BLOCK_GROUP_SLICE_ADD_ID   % static_cast<KaxSliceBlockAddID *>(l5)->GetValue());
 
             else if (!is_global(es, l5, 5))
@@ -1432,22 +1432,22 @@ handle_cluster(EbmlStream *&es,
   cluster->InitTimecode(FindChildValue<KaxClusterTimecode>(m1), s_tc_scale);
 
   for (auto l2 : *m1)
-    if (is_id(l2, KaxClusterTimecode))
+    if (Is<KaxClusterTimecode>(l2))
       show_element(l2, 2, BF_CLUSTER_TIMECODE      % (static_cast<double>(static_cast<KaxClusterTimecode *>(l2)->GetValue()) * s_tc_scale / 1000000000.0));
 
-    else if (is_id(l2, KaxClusterPosition))
+    else if (Is<KaxClusterPosition>(l2))
       show_element(l2, 2, BF_CLUSTER_POSITION      % static_cast<KaxClusterPosition *>(l2)->GetValue());
 
-    else if (is_id(l2, KaxClusterPrevSize))
+    else if (Is<KaxClusterPrevSize>(l2))
       show_element(l2, 2, BF_CLUSTER_PREVIOUS_SIZE % static_cast<KaxClusterPrevSize *>(l2)->GetValue());
 
-    else if (is_id(l2, KaxClusterSilentTracks))
+    else if (Is<KaxClusterSilentTracks>(l2))
       handle_silent_track(es, l2);
 
-    else if (is_id(l2, KaxBlockGroup))
+    else if (Is<KaxBlockGroup>(l2))
       handle_block_group(es, l2, cluster);
 
-    else if (is_id(l2, KaxSimpleBlock))
+    else if (Is<KaxSimpleBlock>(l2))
       handle_simple_block(es, l2, cluster);
 
     else if (!is_global(es, l2, 2))
@@ -1538,25 +1538,25 @@ handle_ebml_head(EbmlElement *l0,
 
     e->ReadData(*in);
 
-    if (is_id(e, EVersion))
+    if (Is<EVersion>(e))
       show_element(e, 1, boost::format(Y("EBML version: %1%"))             % static_cast<EbmlUInteger *>(e)->GetValue());
 
-    else if (is_id(e, EReadVersion))
+    else if (Is<EReadVersion>(e))
       show_element(e, 1, boost::format(Y("EBML read version: %1%"))        % static_cast<EbmlUInteger *>(e)->GetValue());
 
-    else if (is_id(e, EMaxIdLength))
+    else if (Is<EMaxIdLength>(e))
       show_element(e, 1, boost::format(Y("EBML maximum ID length: %1%"))   % static_cast<EbmlUInteger *>(e)->GetValue());
 
-    else if (is_id(e, EMaxSizeLength))
+    else if (Is<EMaxSizeLength>(e))
       show_element(e, 1, boost::format(Y("EBML maximum size length: %1%")) % static_cast<EbmlUInteger *>(e)->GetValue());
 
-    else if (is_id(e, EDocType))
+    else if (Is<EDocType>(e))
       show_element(e, 1, boost::format(Y("Doc type: %1%"))                 % std::string(*static_cast<EbmlString *>(e)));
 
-    else if (is_id(e, EDocTypeVersion))
+    else if (Is<EDocTypeVersion>(e))
       show_element(e, 1, boost::format(Y("Doc type version: %1%"))         % static_cast<EbmlUInteger *>(e)->GetValue());
 
-    else if (is_id(e, EDocTypeReadVersion))
+    else if (Is<EDocTypeReadVersion>(e))
       show_element(e, 1, boost::format(Y("Doc type read version: %1%"))    % static_cast<EbmlUInteger *>(e)->GetValue());
 
     else
@@ -1640,7 +1640,7 @@ process_file(const std::string &file_name) {
         return false;
       }
 
-      if (is_id(l0, KaxSegment)) {
+      if (Is<KaxSegment>(l0)) {
         if (!l0->IsFiniteSize())
           show_element(l0, 0, Y("Segment, size unknown"));
         else
@@ -1662,16 +1662,16 @@ process_file(const std::string &file_name) {
     while ((l1 = kax_file->read_next_level1_element())) {
       std::shared_ptr<EbmlElement> af_l1(l1);
 
-      if (is_id(l1, KaxInfo))
+      if (Is<KaxInfo>(l1))
         handle_info(es, upper_lvl_el, l1);
 
-      else if (is_id(l1, KaxTracks))
+      else if (Is<KaxTracks>(l1))
         handle_tracks(es, upper_lvl_el, l1);
 
-      else if (is_id(l1, KaxSeekHead))
+      else if (Is<KaxSeekHead>(l1))
         handle_seek_head(es, upper_lvl_el, l1);
 
-      else if (is_id(l1, KaxCluster)) {
+      else if (Is<KaxCluster>(l1)) {
         show_element(l1, 1, Y("Cluster"));
         if ((g_options.m_verbose == 0) && !g_options.m_show_summary) {
           delete l0;
@@ -1681,18 +1681,18 @@ process_file(const std::string &file_name) {
         }
         handle_cluster(es, upper_lvl_el, l1, file_size);
 
-      } else if (is_id(l1, KaxCues))
+      } else if (Is<KaxCues>(l1))
         handle_cues(es, upper_lvl_el, l1);
 
         // Weee! Attachments!
-      else if (is_id(l1, KaxAttachments))
+      else if (Is<KaxAttachments>(l1))
         handle_attachments(es, upper_lvl_el, l1);
 
-      else if (is_id(l1, KaxChapters))
+      else if (Is<KaxChapters>(l1))
         handle_chapters(es, upper_lvl_el, l1);
 
         // Let's handle some TAGS.
-      else if (is_id(l1, KaxTags))
+      else if (Is<KaxTags>(l1))
         handle_tags(es, upper_lvl_el, l1);
 
       else if (!is_global(es, l1, 1))
diff --git a/src/input/r_matroska.cpp b/src/input/r_matroska.cpp
index d018018ce..3b038cb7b 100644
--- a/src/input/r_matroska.cpp
+++ b/src/input/r_matroska.cpp
@@ -102,7 +102,7 @@ using namespace libmatroska;
 #define in_parent(p) \
   (!p->IsFiniteSize() || (m_in->getFilePointer() < (p->GetElementPosition() + p->HeadSize() + p->GetSize())))
 
-#define is_ebmlvoid(e) (EbmlId(*e) == EBML_ID(EbmlVoid))
+#define is_ebmlvoid(e) (Is<EbmlVoid>(e))
 
 #define MAGIC_MKV 0x1a45dfa3
 
@@ -717,7 +717,7 @@ kax_reader_c::handle_tags(mm_io_c *io,
   tags->Read(*m_es, EBML_CLASS_CONTEXT(KaxTags), upper_lvl_el, l2, true);
 
   while (tags->ListSize() > 0) {
-    if (!(EbmlId(*(*tags)[0]) == EBML_ID(KaxTag))) {
+    if (!Is<KaxTag>((*tags)[0])) {
       delete (*tags)[0];
       tags->Remove(0);
       continue;
@@ -934,7 +934,7 @@ kax_reader_c::read_headers_tracks(mm_io_c *io,
   io->save_pos(position);
   EbmlElement *l1 = m_es->FindNextElement(EBML_CONTEXT(l0), upper_lvl_el, 0xFFFFFFFFL, true);
 
-  if (!l1 || !is_id(l1, KaxTracks)) {
+  if (!l1 || !Is<KaxTracks>(l1)) {
     delete l1;
     io->restore_pos();
 
@@ -1061,7 +1061,7 @@ kax_reader_c::handle_seek_head(mm_io_c *io,
     seek_head->Read(*m_es, EBML_CLASS_CONTEXT(KaxSeekHead), upper_lvl_el, l2, true);
 
     for (auto l2 : *seek_head) {
-      if (EbmlId(*l2) != EBML_ID(KaxSeek))
+      if (!Is<KaxSeek>(l2))
         continue;
 
       KaxSeek &seek = *static_cast<KaxSeek *>(l2);
@@ -1076,13 +1076,13 @@ kax_reader_c::handle_seek_head(mm_io_c *io,
 
       EbmlId id(k_id->GetBuffer(), k_id->GetSize());
 
-      deferred_l1_type_e type = id == EBML_ID(KaxAttachments) ? dl1t_attachments
-        :                       id == EBML_ID(KaxChapters)    ? dl1t_chapters
-        :                       id == EBML_ID(KaxTags)        ? dl1t_tags
-        :                       id == EBML_ID(KaxTracks)      ? dl1t_tracks
-        :                       id == EBML_ID(KaxSeekHead)    ? dl1t_seek_head
-        :                       id == EBML_ID(KaxInfo)        ? dl1t_info
-        :                                                       dl1t_unknown;
+      deferred_l1_type_e type = Is<KaxAttachments>(id) ? dl1t_attachments
+        :                       Is<KaxChapters>(id)    ? dl1t_chapters
+        :                       Is<KaxTags>(id)        ? dl1t_tags
+        :                       Is<KaxTracks>(id)      ? dl1t_tracks
+        :                       Is<KaxSeekHead>(id)    ? dl1t_seek_head
+        :                       Is<KaxInfo>(id)        ? dl1t_info
+        :                                                dl1t_unknown;
 
       if (dl1t_unknown == type)
         continue;
@@ -1138,7 +1138,7 @@ kax_reader_c::read_headers_internal() {
         mxwarn(Y("matroska_reader: No segment found.\n"));
       return false;
     }
-    if (!(EbmlId(*l0) == EBML_ID(KaxSegment))) {
+    if (!Is<KaxSegment>(l0)) {
       if (verbose)
         mxwarn(Y("matroska_reader: No segment found.\n"));
       return false;
@@ -1150,25 +1150,25 @@ kax_reader_c::read_headers_internal() {
     EbmlElement *l1  = m_es->FindNextElement(EBML_CONTEXT(l0), upper_lvl_el, 0xFFFFFFFFL, true, 1);
 
     while (l1 && (0 >= upper_lvl_el)) {
-      if (EbmlId(*l1) == EBML_ID(KaxInfo))
+      if (Is<KaxInfo>(l1))
         m_deferred_l1_positions[dl1t_info].push_back(l1->GetElementPosition());
 
-      else if (EbmlId(*l1) == EBML_ID(KaxTracks))
+      else if (Is<KaxTracks>(l1))
         m_deferred_l1_positions[dl1t_tracks].push_back(l1->GetElementPosition());
 
-      else if (EbmlId(*l1) == EBML_ID(KaxAttachments))
+      else if (Is<KaxAttachments>(l1))
         m_deferred_l1_positions[dl1t_attachments].push_back(l1->GetElementPosition());
 
-      else if (EbmlId(*l1) == EBML_ID(KaxChapters))
+      else if (Is<KaxChapters>(l1))
         m_deferred_l1_positions[dl1t_chapters].push_back(l1->GetElementPosition());
 
-      else if (EbmlId(*l1) == EBML_ID(KaxTags))
+      else if (Is<KaxTags>(l1))
         m_deferred_l1_positions[dl1t_tags].push_back(l1->GetElementPosition());
 
-      else if (EbmlId(*l1) == EBML_ID(KaxSeekHead))
+      else if (Is<KaxSeekHead>(l1))
         handle_seek_head(m_in.get(), l0, l1->GetElementPosition());
 
-      else if (EbmlId(*l1) == EBML_ID(KaxCluster))
+      else if (Is<KaxCluster>(l1))
         cluster = static_cast<KaxCluster *>(l1);
 
       else
@@ -1778,7 +1778,7 @@ kax_reader_c::read_first_frames(kax_track_t *t,
 
       size_t bgidx;
       for (bgidx = 0; bgidx < cluster->ListSize(); bgidx++) {
-        if ((EbmlId(*(*cluster)[bgidx]) == EBML_ID(KaxSimpleBlock))) {
+        if (Is<KaxSimpleBlock>((*cluster)[bgidx])) {
           KaxSimpleBlock *block_simple = static_cast<KaxSimpleBlock *>((*cluster)[bgidx]);
 
           block_simple->SetParent(*cluster);
@@ -1799,7 +1799,7 @@ kax_reader_c::read_first_frames(kax_track_t *t,
             block_track->first_frames_data.back()->grab();
           }
 
-        } else if ((EbmlId(*(*cluster)[bgidx]) == EBML_ID(KaxBlockGroup))) {
+        } else if (Is<KaxBlockGroup>((*cluster)[bgidx])) {
           KaxBlockGroup *block_group = static_cast<KaxBlockGroup *>((*cluster)[bgidx]);
           KaxBlock *block            = static_cast<KaxBlock *>(block_group->FindFirstElt(EBML_INFO(KaxBlock), false));
 
@@ -1877,10 +1877,10 @@ kax_reader_c::read(generic_packetizer_c *requested_ptzr,
     for (bgidx = 0; bgidx < cluster->ListSize(); bgidx++) {
       EbmlElement *element = (*cluster)[bgidx];
 
-      if (EbmlId(*element) == EBML_ID(KaxSimpleBlock))
+      if (Is<KaxSimpleBlock>(element))
         process_simple_block(cluster, static_cast<KaxSimpleBlock *>(element));
 
-      else if (EbmlId(*element) == EBML_ID(KaxBlockGroup))
+      else if (Is<KaxBlockGroup>(element))
         process_block_group(cluster, static_cast<KaxBlockGroup *>(element));
     }
 
@@ -2125,7 +2125,7 @@ kax_reader_c::process_block_group(KaxCluster *cluster,
       auto blockadd = FindChild<KaxBlockAdditions>(block_group);
       if (blockadd) {
         for (auto &child : *blockadd) {
-          if (!(is_id(child, KaxBlockMore)))
+          if (!(Is<KaxBlockMore>(child)))
             continue;
 
           auto blockmore     = static_cast<KaxBlockMore *>(child);
diff --git a/src/merge/output_control.cpp b/src/merge/output_control.cpp
index d69e8fa70..760d7bdc9 100644
--- a/src/merge/output_control.cpp
+++ b/src/merge/output_control.cpp
@@ -1748,7 +1748,7 @@ finish_file(bool last_file,
   } else if (!last_file && g_no_linking) {
     size_t i;
     for (i = 0; s_kax_infos->ListSize() > i; ++i)
-      if (EbmlId(*(*s_kax_infos)[i]) == EBML_ID(KaxNextUID)) {
+      if (Is<KaxNextUID>((*s_kax_infos)[i])) {
         delete (*s_kax_infos)[i];
         s_kax_infos->Remove(i);
         changed = 2;
diff --git a/src/mmg/header_editor/top_level_page.cpp b/src/mmg/header_editor/top_level_page.cpp
index 0bc0ff258..0f2ce3546 100644
--- a/src/mmg/header_editor/top_level_page.cpp
+++ b/src/mmg/header_editor/top_level_page.cpp
@@ -45,7 +45,7 @@ void
 he_top_level_page_c::do_modifications() {
   he_page_base_c::do_modifications();
 
-  if (is_id(m_l1_element, KaxInfo))
+  if (Is<KaxInfo>(m_l1_element.get()))
     fix_mandatory_segmentinfo_elements(m_l1_element.get());
 
   m_l1_element->UpdateSize(true, true);
diff --git a/src/mmg/tabs/chapters.cpp b/src/mmg/tabs/chapters.cpp
index a781df0e4..e4fbcb604 100644
--- a/src/mmg/tabs/chapters.cpp
+++ b/src/mmg/tabs/chapters.cpp
@@ -1672,7 +1672,7 @@ tab_chapters::on_drag_end(wxTreeEvent &evt) {
 
     new_parent_id           = dst;
     new_parent_master       = !src_node->is_atom ? static_cast<EbmlMaster *>(m_chapters) : dst_master;
-    insert_before_in_master = std::distance(new_parent_master->GetElementList().begin(), brng::find_if(new_parent_master->GetElementList(), Is<KaxEditionEntry, KaxChapterAtom>));
+    insert_before_in_master = std::distance(new_parent_master->GetElementList().begin(), brng::find_if(new_parent_master->GetElementList(), [](EbmlElement *e) { return Is<KaxEditionEntry, KaxChapterAtom>(e); }));
     insert_before_in_tree   = 0;
 
   } else {
diff --git a/src/propedit/track_target.cpp b/src/propedit/track_target.cpp
index a92b1bc7f..25918b0e2 100644
--- a/src/propedit/track_target.cpp
+++ b/src/propedit/track_target.cpp
@@ -127,7 +127,7 @@ track_target_c::set_level1_element(ebml_element_cptr level1_element_cp,
 
   size_t i;
   for (i = 0; track_headers->ListSize() > i; ++i) {
-    if (!is_id((*track_headers)[i], KaxTrackEntry))
+    if (!Is<KaxTrackEntry>((*track_headers)[i]))
       continue;
 
     KaxTrackEntry *track = dynamic_cast<KaxTrackEntry *>((*track_headers)[i]);