From b3701fa8108d48503441972864ee5c4f74e953d1 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 21 Jan 2023 17:28:39 +0100
Subject: [PATCH 01/11] Updated glob dependency to commit b66732b0e72

---
 thirdparty/glob/glob.hpp | 715 ++++++++++++++++++---------------------
 1 file changed, 338 insertions(+), 377 deletions(-)

diff --git a/thirdparty/glob/glob.hpp b/thirdparty/glob/glob.hpp
index 0df3f96e..3ac7f099 100644
--- a/thirdparty/glob/glob.hpp
+++ b/thirdparty/glob/glob.hpp
@@ -1,460 +1,421 @@
 
 #pragma once
 #include <cassert>
-#include <filesystem>
 #include <functional>
 #include <iostream>
 #include <map>
 #include <regex>
 #include <string>
 #include <vector>
-namespace fs = std::filesystem;
+
+#ifdef GLOB_USE_GHC_FILESYSTEM
+#include <ghc/filesystem.hpp>
+#else
+#include <filesystem>
+#endif
 
 namespace glob {
 
+#ifdef GLOB_USE_GHC_FILESYSTEM
+namespace fs = ghc::filesystem;
+#else
+namespace fs = std::filesystem;
+#endif
+
 namespace {
 
-static inline bool string_replace(
-    std::string &str, const std::string &from, const std::string &to)
-{
-    std::size_t start_pos = str.find(from);
-    if (start_pos == std::string::npos)
-        return false;
-    str.replace(start_pos, from.length(), to);
-    return true;
+static inline 
+bool string_replace(std::string &str, const std::string &from, const std::string &to) {
+  std::size_t start_pos = str.find(from);
+  if (start_pos == std::string::npos)
+    return false;
+  str.replace(start_pos, from.length(), to);
+  return true;
 }
 
-static inline std::string translate(const std::string &pattern)
-{
-    std::size_t i = 0, n = pattern.size();
-    std::string result_string;
+static inline 
+std::string translate(const std::string &pattern) {
+  std::size_t i = 0, n = pattern.size();
+  std::string result_string;
 
-    while (i < n) {
-        auto c = pattern[i];
-        i += 1;
-        if (c == '*') {
-            result_string += ".*";
+  while (i < n) {
+    auto c = pattern[i];
+    i += 1;
+    if (c == '*') {
+      result_string += ".*";
+    } else if (c == '?') {
+      result_string += ".";
+    } else if (c == '[') {
+      auto j = i;
+      if (j < n && pattern[j] == '!') {
+        j += 1;
+      }
+      if (j < n && pattern[j] == ']') {
+        j += 1;
+      }
+      while (j < n && pattern[j] != ']') {
+        j += 1;
+      }
+      if (j >= n) {
+        result_string += "\\[";
+      } else {
+        auto stuff = std::string(pattern.begin() + i, pattern.begin() + j);
+        if (stuff.find("--") == std::string::npos) {
+          string_replace(stuff, std::string{"\\"}, std::string{R"(\\)"});
+        } else {
+          std::vector<std::string> chunks;
+          std::size_t k = 0;
+          if (pattern[i] == '!') {
+            k = i + 2;
+          } else {
+            k = i + 1;
+          }
+
+          while (true) {
+            k = pattern.find("-", k, j);
+            if (k == std::string::npos) {
+              break;
+            }
+            chunks.push_back(std::string(pattern.begin() + i, pattern.begin() + k));
+            i = k + 1;
+            k = k + 3;
+          }
+
+          chunks.push_back(std::string(pattern.begin() + i, pattern.begin() + j));
+          // Escape backslashes and hyphens for set difference (--).
+          // Hyphens that create ranges shouldn't be escaped.
+          bool first = false;
+          for (auto &s : chunks) {
+            string_replace(s, std::string{"\\"}, std::string{R"(\\)"});
+            string_replace(s, std::string{"-"}, std::string{R"(\-)"});
+            if (first) {
+              stuff += s;
+              first = false;
+            } else {
+              stuff += "-" + s;
+            }
+          }
         }
-        else if (c == '?') {
-            result_string += ".";
+
+        // Escape set operations (&&, ~~ and ||).
+        std::string result;
+        std::regex_replace(std::back_inserter(result),          // result
+                           stuff.begin(), stuff.end(),          // string
+                           std::regex(std::string{R"([&~|])"}), // pattern
+                           std::string{R"(\\\1)"});             // repl
+        stuff = result;
+        i = j + 1;
+        if (stuff[0] == '!') {
+          stuff = "^" + std::string(stuff.begin() + 1, stuff.end());
+        } else if (stuff[0] == '^' || stuff[0] == '[') {
+          stuff = "\\\\" + stuff;
         }
-        else if (c == '[') {
-            auto j = i;
-            if (j < n && pattern[j] == '!') {
-                j += 1;
-            }
-            if (j < n && pattern[j] == ']') {
-                j += 1;
-            }
-            while (j < n && pattern[j] != ']') {
-                j += 1;
-            }
-            if (j >= n) {
-                result_string += "\\[";
-            }
-            else {
-                auto stuff =
-                    std::string(pattern.begin() + i, pattern.begin() + j);
-                if (stuff.find("--") == std::string::npos) {
-                    string_replace(
-                        stuff, std::string{"\\"}, std::string{R"(\\)"});
-                }
-                else {
-                    std::vector<std::string> chunks;
-                    std::size_t k = 0;
-                    if (pattern[i] == '!') {
-                        k = i + 2;
-                    }
-                    else {
-                        k = i + 1;
-                    }
-
-                    while (true) {
-                        k = pattern.find("-", k, j);
-                        if (k == std::string::npos) {
-                            break;
-                        }
-                        chunks.push_back(std::string(
-                            pattern.begin() + i, pattern.begin() + k));
-                        i = k + 1;
-                        k = k + 3;
-                    }
-
-                    chunks.push_back(
-                        std::string(pattern.begin() + i, pattern.begin() + j));
-                    // Escape backslashes and hyphens for set difference (--).
-                    // Hyphens that create ranges shouldn't be escaped.
-                    bool first = false;
-                    for (auto &s : chunks) {
-                        string_replace(
-                            s, std::string{"\\"}, std::string{R"(\\)"});
-                        string_replace(
-                            s, std::string{"-"}, std::string{R"(\-)"});
-                        if (first) {
-                            stuff += s;
-                            first = false;
-                        }
-                        else {
-                            stuff += "-" + s;
-                        }
-                    }
-                }
-
-                // Escape set operations (&&, ~~ and ||).
-                std::string result;
-                std::regex_replace(std::back_inserter(result), // ressult
-                    stuff.begin(), stuff.end(),                // string
-                    std::regex(std::string{R"([&~|])"}),       // pattern
-                    std::string{R"(\\\1)"});                   // repl
-                stuff = result;
-                i = j + 1;
-                if (stuff[0] == '!') {
-                    stuff = "^" + std::string(stuff.begin() + 1, stuff.end());
-                }
-                else if (stuff[0] == '^' || stuff[0] == '[') {
-                    stuff = "\\\\" + stuff;
-                }
-                result_string = result_string + "[" + stuff + "]";
-            }
+        result_string = result_string + "[" + stuff + "]";
+      }
+    } else {
+      // SPECIAL_CHARS
+      // closing ')', '}' and ']'
+      // '-' (a range in character set)
+      // '&', '~', (extended character set operations)
+      // '#' (comment) and WHITESPACE (ignored) in verbose mode
+      static std::string special_characters = "()[]{}?*+-|^$\\.&~# \t\n\r\v\f";
+      static std::map<int, std::string> special_characters_map;
+      if (special_characters_map.empty()) {
+        for (auto &sc : special_characters) {
+          special_characters_map.insert(
+              std::make_pair(static_cast<int>(sc), std::string{"\\"} + std::string(1, sc)));
         }
-        else {
-            // SPECIAL_CHARS
-            // closing ')', '}' and ']'
-            // '-' (a range in character set)
-            // '&', '~', (extended character set operations)
-            // '#' (comment) and WHITESPACE (ignored) in verbose mode
-            static std::string special_characters =
-                "()[]{}?*+-|^$\\.&~# \t\n\r\v\f";
-            static std::map<int, std::string> special_characters_map;
-            if (special_characters_map.empty()) {
-                for (auto &c : special_characters) {
-                    special_characters_map.insert(
-                        std::make_pair(static_cast<int>(c),
-                            std::string{"\\"} + std::string(1, c)));
-                }
-            }
+      }
 
-            if (special_characters.find(c) != std::string::npos) {
-                result_string += special_characters_map[static_cast<int>(c)];
-            }
-            else {
-                result_string += c;
-            }
-        }
+      if (special_characters.find(c) != std::string::npos) {
+        result_string += special_characters_map[static_cast<int>(c)];
+      } else {
+        result_string += c;
+      }
     }
-    return std::string{"(("} + result_string + std::string{R"()|[\r\n])$)"};
+  }
+  return std::string{"(("} + result_string + std::string{R"()|[\r\n])$)"};
 }
 
-static inline std::regex compile_pattern(const std::string &pattern)
-{
-    return std::regex(translate(pattern), std::regex::ECMAScript);
+static inline 
+std::regex compile_pattern(const std::string &pattern) {
+  return std::regex(translate(pattern), std::regex::ECMAScript);
 }
 
-static inline bool fnmatch_case(
-    const fs::path &name, const std::string &pattern)
-{
-    return std::regex_match(name.string(), compile_pattern(pattern));
+static inline 
+bool fnmatch(const fs::path &name, const std::string &pattern) {
+  return std::regex_match(name.string(), compile_pattern(pattern));
 }
 
-static inline std::vector<fs::path> filter(
-    const std::vector<fs::path> &names, const std::string &pattern)
-{
-    // std::cout << "Pattern: " << pattern << "\n";
-    std::vector<fs::path> result;
-    for (auto &name : names) {
-        // std::cout << "Checking for " << name.string() << "\n";
-        if (fnmatch_case(name, pattern)) {
-            result.push_back(name);
-        }
+static inline 
+std::vector<fs::path> filter(const std::vector<fs::path> &names,
+                             const std::string &pattern) {
+  // std::cout << "Pattern: " << pattern << "\n";
+  std::vector<fs::path> result;
+  for (auto &name : names) {
+    // std::cout << "Checking for " << name.string() << "\n";
+    if (fnmatch(name, pattern)) {
+      result.push_back(name);
     }
-    return result;
+  }
+  return result;
 }
 
-static inline fs::path expand_tilde(fs::path path)
-{
-    if (path.empty())
-        return path;
+static inline 
+fs::path expand_tilde(fs::path path) {
+  if (path.empty()) return path;
+
 #ifdef _WIN32
-    char *home;
-    size_t sz;
-    [[maybe_unused]] errno_t err = _dupenv_s(&home, &sz, "USERPROFILE");
+  const char * home_variable = "USERNAME";
 #else
-    const char *home = std::getenv("HOME");
+  const char * home_variable = "USER";
 #endif
-    if (home == nullptr) {
-        throw std::invalid_argument(
-            "error: Unable to expand `~` - HOME environment variable not set.");
-    }
+  const char * home = std::getenv(home_variable);
+  if (home == nullptr) {
+    throw std::invalid_argument("error: Unable to expand `~` - HOME environment variable not set.");
+  }
 
-    std::string s = path.string();
-    if (s[0] == '~') {
-        s = std::string(home) + s.substr(1, s.size() - 1);
-        return fs::path(s);
-    }
-    else {
-        return path;
-    }
+  std::string s = path.string();
+  if (s[0] == '~') {
+    s = std::string(home) + s.substr(1, s.size() - 1);
+    return fs::path(s);
+  } else {
+    return path;
+  }
 }
 
-static inline bool has_magic(const std::string &pathname)
-{
-    static const auto magic_check = std::regex("([*?[])");
-    return std::regex_search(pathname, magic_check);
+static inline 
+bool has_magic(const std::string &pathname) {
+  static const auto magic_check = std::regex("([*?[])");
+  return std::regex_search(pathname, magic_check);
 }
 
-static inline bool is_hidden(const std::string &pathname)
-{
-    return std::regex_match(
-        pathname, std::regex("^(.*\\/)*\\.[^\\.\\/]+\\/*$"));
+static inline 
+bool is_hidden(const std::string &pathname) {
+  return std::regex_match(pathname, std::regex("^(.*\\/)*\\.[^\\.\\/]+\\/*$"));
 }
 
-static inline bool is_recursive(const std::string &pattern)
-{
-    return pattern == "**";
-}
+static inline 
+bool is_recursive(const std::string &pattern) { return pattern == "**"; }
 
-static inline std::vector<fs::path> iter_directory(
-    const fs::path &dirname, bool dironly)
-{
-    std::vector<fs::path> result;
+static inline 
+std::vector<fs::path> iter_directory(const fs::path &dirname, bool dironly) {
+  std::vector<fs::path> result;
 
-    auto current_directory = dirname;
-    if (current_directory.empty()) {
-        current_directory = fs::current_path();
-    }
+  auto current_directory = dirname;
+  if (current_directory.empty()) {
+    current_directory = fs::current_path();
+  }
 
-    if (fs::exists(current_directory)) {
-        try {
-            for (auto &entry : fs::directory_iterator(current_directory,
-                     fs::directory_options::follow_directory_symlink |
-                         fs::directory_options::skip_permission_denied)) {
-                if (!dironly || entry.is_directory()) {
-                    if (dirname.is_absolute()) {
-                        result.push_back(entry.path());
-                    }
-                    else {
-                        result.push_back(fs::relative(entry.path()));
-                    }
-                }
-            }
-        }
-        catch (std::exception &) {
-            // not a directory
-            // do nothing
+  if (fs::exists(current_directory)) {
+    try {
+      for (auto &entry : fs::directory_iterator(
+              current_directory, fs::directory_options::follow_directory_symlink |
+                                      fs::directory_options::skip_permission_denied)) {
+        if (!dironly || entry.is_directory()) {
+          if (dirname.is_absolute()) {
+            result.push_back(entry.path());
+          } else {
+            result.push_back(fs::relative(entry.path()));
+          }
         }
+      }
+    } catch (std::exception&) {
+      // not a directory
+      // do nothing
     }
+  }
 
-    return result;
+  return result;
 }
 
 // Recursively yields relative pathnames inside a literal directory.
-static inline std::vector<fs::path> rlistdir(
-    const fs::path &dirname, bool dironly)
-{
-    std::vector<fs::path> result;
-    auto names = iter_directory(dirname, dironly);
-    for (auto &x : names) {
-        if (!is_hidden(x.string())) {
-            result.push_back(x);
-            for (auto &y : rlistdir(x, dironly)) {
-                result.push_back(y);
-            }
-        }
+static inline 
+std::vector<fs::path> rlistdir(const fs::path &dirname, bool dironly) {
+  std::vector<fs::path> result;
+  auto names = iter_directory(dirname, dironly);
+  for (auto &x : names) {
+    if (!is_hidden(x.string())) {
+      result.push_back(x);
+      for (auto &y : rlistdir(x, dironly)) {
+        result.push_back(y);
+      }
     }
-    return result;
+  }
+  return result;
 }
 
 // This helper function recursively yields relative pathnames inside a literal
 // directory.
-static inline std::vector<fs::path> glob2(const fs::path &dirname,
-    [[maybe_unused]] const std::string &pattern, bool dironly)
-{
-    // std::cout << "In glob2\n";
-    std::vector<fs::path> result;
-    assert(is_recursive(pattern));
-    for (auto &dir : rlistdir(dirname, dironly)) {
-        result.push_back(dir);
-    }
-    return result;
+static inline 
+std::vector<fs::path> glob2(const fs::path &dirname, [[maybe_unused]] const std::string &pattern,
+                            bool dironly) {
+  // std::cout << "In glob2\n";
+  std::vector<fs::path> result;
+  assert(is_recursive(pattern));
+  for (auto &dir : rlistdir(dirname, dironly)) {
+    result.push_back(dir);
+  }
+  return result;
 }
 
 // These 2 helper functions non-recursively glob inside a literal directory.
 // They return a list of basenames.  _glob1 accepts a pattern while _glob0
 // takes a literal basename (so it only has to check for its existence).
-static inline std::vector<fs::path> glob1(
-    const fs::path &dirname, const std::string &pattern, bool dironly)
-{
-    // std::cout << "In glob1\n";
-    auto names = iter_directory(dirname, dironly);
-    std::vector<fs::path> filtered_names;
-    for (auto &n : names) {
-        if (!is_hidden(n.string())) {
-            filtered_names.push_back(n.filename());
-            // if (n.is_relative()) {
-            //   // std::cout << "Filtered (Relative): " << n << "\n";
-            //   filtered_names.push_back(fs::relative(n));
-            // } else {
-            //   // std::cout << "Filtered (Absolute): " << n << "\n";
-            //   filtered_names.push_back(n.filename());
-            // }
-        }
+static inline 
+std::vector<fs::path> glob1(const fs::path &dirname, const std::string &pattern,
+                            bool dironly) {
+  // std::cout << "In glob1\n";
+  auto names = iter_directory(dirname, dironly);
+  std::vector<fs::path> filtered_names;
+  for (auto &n : names) {
+    if (!is_hidden(n.string())) {
+      filtered_names.push_back(n.filename());
+      // if (n.is_relative()) {
+      //   // std::cout << "Filtered (Relative): " << n << "\n";
+      //   filtered_names.push_back(fs::relative(n));
+      // } else {
+      //   // std::cout << "Filtered (Absolute): " << n << "\n";
+      //   filtered_names.push_back(n.filename());
+      // }
     }
-    return filter(filtered_names, pattern);
+  }
+  return filter(filtered_names, pattern);
 }
 
-static inline std::vector<fs::path> glob0(
-    const fs::path &dirname, const fs::path &basename, bool /*dironly*/)
-{
-    // std::cout << "In glob0\n";
-    std::vector<fs::path> result;
-    if (basename.empty()) {
-        // 'q*x/' should match only directories.
-        if (fs::is_directory(dirname)) {
-            result = {basename};
-        }
+static inline 
+std::vector<fs::path> glob0(const fs::path &dirname, const fs::path &basename,
+                            bool /*dironly*/) {
+  // std::cout << "In glob0\n";
+  std::vector<fs::path> result;
+  if (basename.empty()) {
+    // 'q*x/' should match only directories.
+    if (fs::is_directory(dirname)) {
+      result = {basename};
     }
-    else {
-        if (fs::exists(dirname / basename)) {
-            result = {basename};
-        }
+  } else {
+    if (fs::exists(dirname / basename)) {
+      result = {basename};
     }
-    return result;
-}
-
-static inline std::vector<fs::path> glob(const std::string &pathname,
-    bool recursive = false, bool dironly = false,
-    std::filesystem::path root_directory = std::filesystem::current_path())
-{
-    std::vector<fs::path> result;
-
-    auto path = fs::path(pathname);
-
-    if (pathname[0] == '~') {
-        // expand tilde
-        path = expand_tilde(path);
-    }
-
-    auto dirname = path.parent_path();
-    const auto basename = path.filename();
-
-    if (!has_magic(pathname)) {
-        assert(!dironly);
-        if (!basename.empty()) {
-            if (!root_directory.empty() && !path.is_absolute()) {
-                if (fs::exists(root_directory / path)) {
-                    result.push_back(path);
-                }
-            }
-            else if (fs::exists(path)) {
-                result.push_back(path);
-            }
-        }
-        else {
-            // Patterns ending with a slash should match only directories
-            if (fs::is_directory(dirname)) {
-                result.push_back(path);
-            }
-        }
-        return result;
-    }
-
-    if (dirname.empty()) {
-        if (recursive && is_recursive(basename.string())) {
-            return glob2(dirname, basename.string(), dironly);
-        }
-        else {
-            return glob1(dirname, basename.string(), dironly);
-        }
-    }
-
-    std::vector<fs::path> dirs;
-    if (dirname != fs::path(pathname) && has_magic(dirname.string())) {
-        dirs = glob(dirname.string(), recursive, true);
-    }
-    else {
-        dirs = {dirname};
-    }
-
-    std::function<std::vector<fs::path>(
-        const fs::path &, const std::string &, bool)>
-        glob_in_dir;
-    if (has_magic(basename.string())) {
-        if (recursive && is_recursive(basename.string())) {
-            glob_in_dir = glob2;
-        }
-        else {
-            glob_in_dir = glob1;
-        }
-    }
-    else {
-        glob_in_dir = glob0;
-    }
-
-    for (auto &d : dirs) {
-        for (auto &name : glob_in_dir(root_directory / d, basename.string(), dironly)) {
-            fs::path subresult = name;
-            if (name.parent_path().empty()) {
-                subresult = d / name;
-            }
-            result.push_back(subresult);
-        }
-    }
-
-    return result;
+  }
+  return result;
 }
 
 } // namespace end
 
-static inline std::vector<fs::path> glob(const std::string &pathname)
-{
-    return glob(pathname, false);
-}
+static inline 
+std::vector<fs::path> glob(const std::string &pathname, bool recursive = false,
+                           bool dironly = false) {
+  std::vector<fs::path> result;
 
-static inline std::vector<fs::path> rglob(const std::string &pathname)
-{
-    return glob(pathname, true);
-}
+  auto path = fs::path(pathname);
 
-static inline std::vector<fs::path> glob(
-    const std::string &pathname, const std::filesystem::path root_directory)
-{
-    return glob(pathname, true, false, root_directory);
-}
+  if (pathname[0] == '~') {
+    // expand tilde
+    path = expand_tilde(path);
+  }
 
-static inline std::vector<std::filesystem::path> glob(
-    const std::vector<std::string> &pathnames)
-{
-    std::vector<std::filesystem::path> result;
-    for (auto &pathname : pathnames) {
-        for (auto &match : glob(pathname, false)) {
-            result.push_back(std::move(match));
-        }
+  auto dirname = path.parent_path();
+  const auto basename = path.filename();
+
+  if (!has_magic(pathname)) {
+    assert(!dironly);
+    if (!basename.empty()) {
+      if (fs::exists(path)) {
+        result.push_back(path);
+      }
+    } else {
+      // Patterns ending with a slash should match only directories
+      if (fs::is_directory(dirname)) {
+        result.push_back(path);
+      }
     }
     return result;
-}
+  }
 
-static inline std::vector<std::filesystem::path> rglob(
-    const std::vector<std::string> &pathnames)
-{
-    std::vector<std::filesystem::path> result;
-    for (auto &pathname : pathnames) {
-        for (auto &match : glob(pathname, true)) {
-            result.push_back(std::move(match));
-        }
+  if (dirname.empty()) {
+    if (recursive && is_recursive(basename.string())) {
+      return glob2(dirname, basename.string(), dironly);
+    } else {
+      return glob1(dirname, basename.string(), dironly);
     }
-    return result;
+  }
+
+  std::vector<fs::path> dirs;
+  if (dirname != fs::path(pathname) && has_magic(dirname.string())) {
+    dirs = glob(dirname.string(), recursive, true);
+  } else {
+    dirs = {dirname};
+  }
+
+  std::function<std::vector<fs::path>(const fs::path &, const std::string &, bool)>
+      glob_in_dir;
+  if (has_magic(basename.string())) {
+    if (recursive && is_recursive(basename.string())) {
+      glob_in_dir = glob2;
+    } else {
+      glob_in_dir = glob1;
+    }
+  } else {
+    glob_in_dir = glob0;
+  }
+
+  for (auto &d : dirs) {
+    for (auto &name : glob_in_dir(d, basename.string(), dironly)) {
+      fs::path subresult = name;
+      if (name.parent_path().empty()) {
+        subresult = d / name;
+      }
+      result.push_back(subresult);
+    }
+  }
+
+  return result;
 }
 
-static inline std::vector<std::filesystem::path> glob(
-    const std::initializer_list<std::string> &pathnames)
-{
-    return glob(std::vector<std::string>(pathnames));
+
+static inline 
+std::vector<fs::path> glob(const std::string &pathname) {
+  return glob(pathname, false);
 }
 
-static inline std::vector<std::filesystem::path> rglob(
-    const std::initializer_list<std::string> &pathnames)
-{
-    return rglob(std::vector<std::string>(pathnames));
+static inline 
+std::vector<fs::path> rglob(const std::string &pathname) {
+  return glob(pathname, true);
+}
+
+static inline 
+std::vector<fs::path> glob(const std::vector<std::string> &pathnames) {
+  std::vector<fs::path> result;
+  for (auto &pathname : pathnames) {
+    for (auto &match : glob(pathname, false)) {
+      result.push_back(std::move(match));
+    }
+  }
+  return result;
+}
+
+static inline 
+std::vector<fs::path> rglob(const std::vector<std::string> &pathnames) {
+  std::vector<fs::path> result;
+  for (auto &pathname : pathnames) {
+    for (auto &match : glob(pathname, true)) {
+      result.push_back(std::move(match));
+    }
+  }
+  return result;
+}
+
+static inline 
+std::vector<fs::path>
+glob(const std::initializer_list<std::string> &pathnames) {
+  return glob(std::vector<std::string>(pathnames));
+}
+
+static inline 
+std::vector<fs::path>
+rglob(const std::initializer_list<std::string> &pathnames) {
+  return rglob(std::vector<std::string>(pathnames));
 }
 
 } // namespace glob

From 78cfa630e5d35d288e285d3a3a00a63e5bc58e7b Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 21 Jan 2023 18:00:21 +0100
Subject: [PATCH 02/11] Fixed handling of relative paths in configuration files
 (#69)

---
 CHANGELOG.md                |  2 ++
 src/config/config.cc        | 12 +++++----
 src/config/config.h         |  6 ++---
 src/config/yaml_decoders.cc | 51 ++++++++++++++++++++++++++++++++++++-
 src/main.cc                 | 38 +++++++++++++++++----------
 src/util/util.cc            | 13 ++++++++++
 src/util/util.h             | 13 ++++++++++
 tests/t00002/test_case.h    |  3 +--
 tests/t00003/test_case.h    |  3 +--
 tests/t00004/test_case.h    |  3 +--
 tests/t00005/test_case.h    |  3 +--
 tests/t00006/test_case.h    |  3 +--
 tests/t00007/test_case.h    |  3 +--
 tests/t00008/test_case.h    |  3 +--
 tests/t00009/test_case.h    |  3 +--
 tests/t00010/test_case.h    |  3 +--
 tests/t00011/test_case.h    |  3 +--
 tests/t00012/test_case.h    |  3 +--
 tests/t00013/test_case.h    |  3 +--
 tests/t00014/test_case.h    |  3 +--
 tests/t00015/test_case.h    |  3 +--
 tests/t00016/test_case.h    |  3 +--
 tests/t00017/test_case.h    |  3 +--
 tests/t00018/test_case.h    |  3 +--
 tests/t00019/test_case.h    |  3 +--
 tests/t00020/test_case.h    |  3 +--
 tests/t00021/test_case.h    |  3 +--
 tests/t00022/test_case.h    |  3 +--
 tests/t00023/test_case.h    |  3 +--
 tests/t00024/test_case.h    |  3 +--
 tests/t00025/test_case.h    |  3 +--
 tests/t00026/test_case.h    |  3 +--
 tests/t00027/test_case.h    |  3 +--
 tests/t00028/test_case.h    |  3 +--
 tests/t00029/test_case.h    |  3 +--
 tests/t00030/test_case.h    |  3 +--
 tests/t00031/test_case.h    |  3 +--
 tests/t00032/test_case.h    |  3 +--
 tests/t00033/test_case.h    |  3 +--
 tests/t00034/test_case.h    |  3 +--
 tests/t00035/test_case.h    |  3 +--
 tests/t00036/test_case.h    |  3 +--
 tests/t00037/test_case.h    |  3 +--
 tests/t00038/test_case.h    |  3 +--
 tests/t00039/test_case.h    |  3 +--
 tests/t00040/test_case.h    |  3 +--
 tests/t00041/test_case.h    |  3 +--
 tests/t00042/test_case.h    |  3 +--
 tests/t00043/test_case.h    |  3 +--
 tests/t00044/test_case.h    |  3 +--
 tests/t00045/test_case.h    |  3 +--
 tests/t00046/test_case.h    |  4 +--
 tests/t00047/test_case.h    |  3 +--
 tests/t00048/test_case.h    |  3 +--
 tests/t00049/test_case.h    |  3 +--
 tests/t00050/test_case.h    |  3 +--
 tests/t20001/test_case.h    |  3 +--
 tests/t20002/test_case.h    |  3 +--
 tests/t20003/test_case.h    |  3 +--
 tests/t20004/test_case.h    |  3 +--
 tests/t20005/test_case.h    |  3 +--
 tests/t20006/test_case.h    |  3 +--
 tests/t20007/test_case.h    |  3 +--
 tests/t20008/test_case.h    |  3 +--
 tests/t20009/test_case.h    |  3 +--
 tests/t20010/test_case.h    |  3 +--
 tests/t20011/test_case.h    |  3 +--
 tests/t20012/test_case.h    |  3 +--
 tests/t20013/test_case.h    |  3 +--
 tests/t20014/test_case.h    |  3 +--
 tests/t20015/test_case.h    |  3 +--
 tests/t20016/test_case.h    |  3 +--
 tests/t20017/test_case.h    |  3 +--
 tests/t20018/test_case.h    |  3 +--
 tests/t20019/test_case.h    |  3 +--
 tests/t20020/test_case.h    |  3 +--
 tests/t20021/test_case.h    |  3 +--
 tests/t20022/test_case.h    |  3 +--
 tests/t20023/test_case.h    |  3 +--
 tests/t20024/test_case.h    |  3 +--
 tests/t20025/test_case.h    |  3 +--
 tests/t20026/test_case.h    |  3 +--
 tests/t20027/test_case.h    |  3 +--
 tests/t20028/test_case.h    |  3 +--
 tests/t20029/test_case.h    |  3 +--
 tests/t30001/test_case.h    |  3 +--
 tests/t30002/test_case.h    |  3 +--
 tests/t30003/test_case.h    |  3 +--
 tests/t30004/test_case.h    |  3 +--
 tests/t30005/test_case.h    |  3 +--
 tests/t30006/test_case.h    |  3 +--
 tests/t30007/test_case.h    |  3 +--
 tests/t30008/test_case.h    |  3 +--
 tests/t40001/test_case.h    |  3 +--
 tests/t40002/test_case.h    |  3 +--
 tests/t40003/test_case.h    |  3 +--
 tests/t90000/test_case.h    |  3 +--
 tests/test_cases.cc         | 10 ++++----
 tests/test_util.cc          | 12 +++++++++
 99 files changed, 221 insertions(+), 207 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb813fde..78ce17b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # CHANGELOG
 
+  * Fixed relative paths in config files to be relative to the parent of
+    the configuration file by default (#69)
   * Added command line option (--dump-config) to print effective config (#77)
   * Added support for building with Microsoft Visual Studio
 
diff --git a/src/config/config.cc b/src/config/config.cc
index 75297355..add25931 100644
--- a/src/config/config.cc
+++ b/src/config/config.cc
@@ -123,16 +123,18 @@ std::string inheritable_diagram_options::simplify_template_type(
     return full_name;
 }
 
-std::vector<std::string> diagram::get_translation_units(
-    const std::filesystem::path &root_directory) const
+std::vector<std::string> diagram::get_translation_units() const
 {
     std::vector<std::string> translation_units{};
 
     for (const auto &g : glob()) {
-        const auto matches = glob::glob(g, root_directory);
+        std::string glob_path =
+            fmt::format("{}/{}", relative_to().string(), g.c_str());
+
+        auto matches = glob::glob(glob_path, true, false);
+
         for (const auto &match : matches) {
-            const auto path =
-                std::filesystem::canonical(root_directory / match);
+            const auto path = std::filesystem::canonical(relative_to() / match);
             translation_units.emplace_back(path.string());
         }
     }
diff --git a/src/config/config.h b/src/config/config.h
index 9ed5c199..893f511c 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -170,8 +170,7 @@ struct diagram : public inheritable_diagram_options {
 
     virtual common::model::diagram_t type() const = 0;
 
-    std::vector<std::string> get_translation_units(
-        const std::filesystem::path &root_directory) const;
+    std::vector<std::string> get_translation_units() const;
 
     void initialize_type_aliases();
 
@@ -268,7 +267,8 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const option<T> &o)
     return out;
 }
 
-config load(const std::string &config_file);
+config load(const std::string &config_file,
+    std::optional<bool> paths_relative_to_pwd = {});
 } // namespace config
 
 namespace common::model {
diff --git a/src/config/yaml_decoders.cc b/src/config/yaml_decoders.cc
index 27417b60..2abe0b3c 100644
--- a/src/config/yaml_decoders.cc
+++ b/src/config/yaml_decoders.cc
@@ -571,7 +571,30 @@ template <> struct convert<config> {
 } // namespace YAML
 
 namespace clanguml::config {
-config load(const std::string &config_file)
+
+namespace {
+void resolve_option_path(YAML::Node &doc, const std::string &option)
+{
+    std::filesystem::path relative_to_path{
+        doc["relative_to"].as<std::string>()};
+
+    assert(relative_to_path.is_absolute());
+
+    std::filesystem::path option_path{doc[option].as<std::string>()};
+
+    if (option_path.is_absolute())
+        return;
+
+    option_path = relative_to_path / option_path.string();
+    option_path = option_path.lexically_normal();
+    option_path.make_preferred();
+
+    doc[option] = option_path.string();
+}
+} // namespace
+
+config load(
+    const std::string &config_file, std::optional<bool> paths_relative_to_pwd)
 {
     try {
         YAML::Node doc = YAML::LoadFile(config_file);
@@ -583,6 +606,32 @@ config load(const std::string &config_file)
         doc.force_insert(
             "__parent_path", config_file_path.parent_path().string());
 
+        //
+        // If no relative_to path is specified in the config, make all paths
+        // resolvable against the parent directory of the .clang-uml config
+        // file, or against the $PWD if it was specified so in the command
+        // line
+        //
+        if (!doc["relative_to"]) {
+            bool paths_relative_to_config_file = true;
+            if (doc["paths_relative_to_config_file"] &&
+                !doc["paths_relative_to_config_file"].as<bool>())
+                paths_relative_to_config_file = false;
+            if (paths_relative_to_pwd && *paths_relative_to_pwd)
+                paths_relative_to_config_file = false;
+
+            if (paths_relative_to_config_file)
+                doc["relative_to"] = config_file_path.parent_path().string();
+            else
+                doc["relative_to"] = std::filesystem::current_path().string();
+        }
+
+        //
+        // Resolve common path-like config options relative to `relative_to`
+        //
+        resolve_option_path(doc, "output_directory");
+        resolve_option_path(doc, "compilation_database_dir");
+
         // If the current directory is also a git repository,
         // load some config values, which can be included in the
         // generated diagrams
diff --git a/src/main.cc b/src/main.cc
index a6fdbbdf..4fc101ce 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -158,9 +158,9 @@ int main(int argc, const char *argv[])
     CLI::App app{"Clang-based PlantUML diagram generator for C++"};
 
     std::string config_path{".clang-uml"};
-    std::string compilation_database_dir{};
+    std::optional<std::string> compilation_database_dir{};
     std::vector<std::string> diagram_names{};
-    std::optional<std::string> output_directory;
+    std::optional<std::string> output_directory{};
     unsigned int thread_count{0};
     bool show_version{false};
     int verbose{0};
@@ -172,6 +172,7 @@ int main(int argc, const char *argv[])
     std::optional<std::string> add_package_diagram;
     std::optional<std::string> add_include_diagram;
     bool dump_config{false};
+    std::optional<bool> paths_relative_to_pwd{};
 
     app.add_option(
         "-c,--config", config_path, "Location of configuration file");
@@ -200,6 +201,9 @@ int main(int argc, const char *argv[])
         "Add include diagram config");
     app.add_flag(
         "--dump-config", dump_config, "Print effective config to stdout");
+    app.add_flag("--paths-relative-to-pwd", paths_relative_to_pwd,
+        "If true, all paths in configuration files are relative to the $PWD "
+        "instead of actual location of `.clang-uml` file.");
 
     CLI11_PARSE(app, argc, argv);
 
@@ -241,7 +245,7 @@ int main(int argc, const char *argv[])
 
     clanguml::config::config config;
     try {
-        config = clanguml::config::load(config_path);
+        config = clanguml::config::load(config_path, paths_relative_to_pwd);
     }
     catch (std::runtime_error &e) {
         LOG_ERROR(e.what());
@@ -253,15 +257,18 @@ int main(int argc, const char *argv[])
         return 0;
     }
 
-    if (dump_config) {
-        print_config(config);
-        return 0;
-    }
-
     LOG_INFO("Loaded clang-uml config from {}", config_path);
 
-    if (!compilation_database_dir.empty()) {
-        config.compilation_database_dir.set(compilation_database_dir);
+    //
+    // Override selected config options from command line
+    //
+    if (compilation_database_dir) {
+        config.compilation_database_dir.set(
+            util::ensure_path_is_absolute(compilation_database_dir.value()));
+    }
+    if (output_directory) {
+        config.output_directory.set(
+            util::ensure_path_is_absolute(output_directory.value()));
     }
 
     LOG_INFO("Loading compilation database from {} directory",
@@ -271,6 +278,11 @@ int main(int argc, const char *argv[])
     if (output_directory)
         od = output_directory.value();
 
+    if (dump_config) {
+        print_config(config);
+        return 0;
+    }
+
     if (!ensure_output_directory_exists(od))
         return 1;
 
@@ -433,8 +445,6 @@ void find_translation_units_for_diagrams(
     const std::vector<std::string> &compilation_database_files,
     std::map<std::string, std::vector<std::string>> &translation_units_map)
 {
-    const auto current_directory = std::filesystem::current_path();
-
     for (const auto &[name, diagram] : config.diagrams) {
         // If there are any specific diagram names provided on the command line,
         // and this diagram is not in that list - skip it
@@ -450,7 +460,7 @@ void find_translation_units_for_diagrams(
         // configuration
         else {
             const std::vector<std::string> translation_units =
-                diagram->get_translation_units(current_directory);
+                diagram->get_translation_units();
 
             std::vector<std::string> valid_translation_units{};
             std::copy_if(compilation_database_files.begin(),
@@ -563,6 +573,8 @@ int create_config_file()
 int add_config_diagram(clanguml::common::model::diagram_t type,
     const std::string &config_file_path, const std::string &name)
 {
+    namespace fs = std::filesystem;
+
     fs::path config_file{config_file_path};
 
     if (!fs::exists(config_file)) {
diff --git a/src/util/util.cc b/src/util/util.cc
index ae243560..16a8b0cc 100644
--- a/src/util/util.cc
+++ b/src/util/util.cc
@@ -317,4 +317,17 @@ std::string path_to_url(const std::filesystem::path &p)
     return fmt::format("{}", fmt::join(path_tokens, "/"));
 }
 
+std::filesystem::path ensure_path_is_absolute(
+    const std::filesystem::path &p, const std::filesystem::path &root)
+{
+    if (p.is_absolute())
+        return p;
+
+    auto result = root / p;
+    result = result.lexically_normal();
+    result.make_preferred();
+
+    return result;
+}
+
 } // namespace clanguml::util
diff --git a/src/util/util.h b/src/util/util.h
index 90ca7775..96e39fbf 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -250,4 +250,17 @@ std::size_t hash_seed(std::size_t seed);
  */
 std::string path_to_url(const std::filesystem::path &p);
 
+/**
+ * @brief Ensure path is absolute.
+ *
+ * If path is absolute, return the p. If path is not absolute, make it
+ * absolute with respect to root directory.
+ *
+ * @param p Path to modify
+ * @param root Root against which the path should be made absolute
+ * @return Absolute path
+ */
+std::filesystem::path ensure_path_is_absolute(const std::filesystem::path &p,
+    const std::filesystem::path &root = std::filesystem::current_path());
+
 } // namespace clanguml::util
\ No newline at end of file
diff --git a/tests/t00002/test_case.h b/tests/t00002/test_case.h
index 91849435..72f328cd 100644
--- a/tests/t00002/test_case.h
+++ b/tests/t00002/test_case.h
@@ -73,6 +73,5 @@ TEST_CASE("t00002", "[test-case][class]")
                 clanguml::util::get_git_commit()),
             "This is class B"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00003/test_case.h b/tests/t00003/test_case.h
index 4eb977d5..c499a033 100644
--- a/tests/t00003/test_case.h
+++ b/tests/t00003/test_case.h
@@ -65,6 +65,5 @@ TEST_CASE("t00003", "[test-case][class]")
     REQUIRE_THAT(puml, (IsField<Private>("b_", "int")));
     REQUIRE_THAT(puml, (IsField<Private>("c_", "int")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00004/test_case.h b/tests/t00004/test_case.h
index 5ee0019c..dedc8496 100644
--- a/tests/t00004/test_case.h
+++ b/tests/t00004/test_case.h
@@ -67,6 +67,5 @@ TEST_CASE("t00004", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("detail::D::DD")));
     REQUIRE_THAT(puml, IsEnum(_A("detail::D::AA")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00005/test_case.h b/tests/t00005/test_case.h
index 567e18a9..101e63ed 100644
--- a/tests/t00005/test_case.h
+++ b/tests/t00005/test_case.h
@@ -66,6 +66,5 @@ TEST_CASE("t00005", "[test-case][class]")
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("J"), "+j"));
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("K"), "+k"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00006/test_case.h b/tests/t00006/test_case.h
index 46577533..ead4a773 100644
--- a/tests/t00006/test_case.h
+++ b/tests/t00006/test_case.h
@@ -76,6 +76,5 @@ TEST_CASE("t00006", "[test-case][class]")
     REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("NN"), "+ns"));
     REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("NNN"), "+ns"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00007/test_case.h b/tests/t00007/test_case.h
index 6eccc517..54a71c2a 100644
--- a/tests/t00007/test_case.h
+++ b/tests/t00007/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00007", "[test-case][class]")
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("B"), "+b"));
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("C"), "+c"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00008/test_case.h b/tests/t00008/test_case.h
index ede6a434..2f216a71 100644
--- a/tests/t00008/test_case.h
+++ b/tests/t00008/test_case.h
@@ -48,6 +48,5 @@ TEST_CASE("t00008", "[test-case][class]")
     // REQUIRE_THAT(puml, IsField(Public("bool (*)(int, int) comparator")));
     REQUIRE_THAT(puml, (IsField<Public>("comparator", "CMP")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00009/test_case.h b/tests/t00009/test_case.h
index 5ad171c3..d522749e 100644
--- a/tests/t00009/test_case.h
+++ b/tests/t00009/test_case.h
@@ -51,6 +51,5 @@ TEST_CASE("t00009", "[test-case][class]")
     REQUIRE_THAT(puml,
         IsAssociation(_A("B"), _A("A<std::vector<std::string>>"), "+avector"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00010/test_case.h b/tests/t00010/test_case.h
index 245f622c..c64778a5 100644
--- a/tests/t00010/test_case.h
+++ b/tests/t00010/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t00010", "[test-case][class]")
         puml, IsAggregation(_A("B<T>"), _A("A<T,std::string>"), "+astring"));
     REQUIRE_THAT(puml, IsAggregation(_A("C"), _A("B<int>"), "+aintstring"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00011/test_case.h b/tests/t00011/test_case.h
index f28cde67..9a717a8e 100644
--- a/tests/t00011/test_case.h
+++ b/tests/t00011/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00011", "[test-case][class]")
     REQUIRE_THAT(puml, IsFriend<Public>(_A("A"), _A("B")));
     // REQUIRE_THAT(puml, IsFriend(_A("A"), _A("D<T>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00012/test_case.h b/tests/t00012/test_case.h
index aa979ee7..9b2daeeb 100644
--- a/tests/t00012/test_case.h
+++ b/tests/t00012/test_case.h
@@ -43,6 +43,5 @@ TEST_CASE("t00012", "[test-case][class]")
             _A("C<std::map<int,"
                "std::vector<std::vector<std::vector<std::string>>>>,3,3,3>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00013/test_case.h b/tests/t00013/test_case.h
index 84da76fa..50cedf0d 100644
--- a/tests/t00013/test_case.h
+++ b/tests/t00013/test_case.h
@@ -62,6 +62,5 @@ TEST_CASE("t00013", "[test-case][class]")
     REQUIRE_THAT(puml,
         IsInstantiation(_A("G<T,Args...>"), _A("G<int,float,std::string>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00014/test_case.h b/tests/t00014/test_case.h
index 54e8ef2e..c20bedb8 100644
--- a/tests/t00014/test_case.h
+++ b/tests/t00014/test_case.h
@@ -114,6 +114,5 @@ TEST_CASE("t00014", "[test-case][class]")
     REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<char,std::string>")));
     REQUIRE_THAT(puml, IsDependency(_A("R"), _A("A<wchar_t,std::string>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00015/test_case.h b/tests/t00015/test_case.h
index fd934a22..12ed0c5e 100644
--- a/tests/t00015/test_case.h
+++ b/tests/t00015/test_case.h
@@ -40,6 +40,5 @@ TEST_CASE("t00015", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("ns3::ns1::ns2::Anon")));
     REQUIRE_THAT(puml, IsClass(_A("ns3::B")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00016/test_case.h b/tests/t00016/test_case.h
index b3304a33..f2519687 100644
--- a/tests/t00016/test_case.h
+++ b/tests/t00016/test_case.h
@@ -49,6 +49,5 @@ TEST_CASE("t00016", "[test-case][class]")
     REQUIRE_THAT(
         puml, IsInstantiation(_A("is_numeric<>"), _A("is_numeric<float>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00017/test_case.h b/tests/t00017/test_case.h
index 33f1c000..f5fae0ea 100644
--- a/tests/t00017/test_case.h
+++ b/tests/t00017/test_case.h
@@ -67,6 +67,5 @@ TEST_CASE("t00017", "[test-case][class]")
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("J"), "-j"));
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("K"), "-k"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00018/test_case.h b/tests/t00018/test_case.h
index db47adc6..cea7544b 100644
--- a/tests/t00018/test_case.h
+++ b/tests/t00018/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00018", "[test-case][class]")
     REQUIRE_THAT(puml, IsDependency(_A("impl::widget"), _A("widget")));
     REQUIRE_THAT(puml, !IsDependency(_A("widget"), _A("widget")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00019/test_case.h b/tests/t00019/test_case.h
index db0e16a0..6165fd16 100644
--- a/tests/t00019/test_case.h
+++ b/tests/t00019/test_case.h
@@ -54,6 +54,5 @@ TEST_CASE("t00019", "[test-case][class]")
 
     REQUIRE_THAT(puml, !IsAggregation(_A("A"), _A("Base"), "+layers"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00020/test_case.h b/tests/t00020/test_case.h
index 131c920a..17000f1e 100644
--- a/tests/t00020/test_case.h
+++ b/tests/t00020/test_case.h
@@ -44,6 +44,5 @@ TEST_CASE("t00020", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("Factory1")));
     REQUIRE_THAT(puml, IsClass(_A("Factory2")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00021/test_case.h b/tests/t00021/test_case.h
index bfd4e6eb..87eb192a 100644
--- a/tests/t00021/test_case.h
+++ b/tests/t00021/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00021", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("Visitor2")));
     REQUIRE_THAT(puml, IsClass(_A("Visitor3")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00022/test_case.h b/tests/t00022/test_case.h
index e16e979a..6078122e 100644
--- a/tests/t00022/test_case.h
+++ b/tests/t00022/test_case.h
@@ -38,6 +38,5 @@ TEST_CASE("t00022", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("A1")));
     REQUIRE_THAT(puml, IsClass(_A("A2")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00023/test_case.h b/tests/t00023/test_case.h
index 5dd70267..ff92588a 100644
--- a/tests/t00023/test_case.h
+++ b/tests/t00023/test_case.h
@@ -38,6 +38,5 @@ TEST_CASE("t00023", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("StrategyA")));
     REQUIRE_THAT(puml, IsClass(_A("StrategyB")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00024/test_case.h b/tests/t00024/test_case.h
index bf270004..ea7f5aa8 100644
--- a/tests/t00024/test_case.h
+++ b/tests/t00024/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00024", "[test-case][class]")
     REQUIRE_THAT(puml, IsBaseClass(_A("Target"), _A("Target2")));
     REQUIRE_THAT(puml, IsBaseClass(_A("Target"), _A("Proxy")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00025/test_case.h b/tests/t00025/test_case.h
index ac0dab92..b23ac6e2 100644
--- a/tests/t00025/test_case.h
+++ b/tests/t00025/test_case.h
@@ -50,6 +50,5 @@ TEST_CASE("t00025", "[test-case][class]")
     REQUIRE_THAT(puml, IsDependency(_A("Proxy<Target1>"), _A("Target1")));
     REQUIRE_THAT(puml, IsDependency(_A("Proxy<Target2>"), _A("Target2")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00026/test_case.h b/tests/t00026/test_case.h
index 8c92e05a..aabb247e 100644
--- a/tests/t00026/test_case.h
+++ b/tests/t00026/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00026", "[test-case][class]")
     REQUIRE_THAT(puml,
         IsInstantiation(_A("Caretaker<T>"), _A("Caretaker<std::string>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00027/test_case.h b/tests/t00027/test_case.h
index bdbb0221..ea3e5b7a 100644
--- a/tests/t00027/test_case.h
+++ b/tests/t00027/test_case.h
@@ -54,6 +54,5 @@ TEST_CASE("t00027", "[test-case][class]")
     REQUIRE_THAT(
         puml, IsAggregation(_A("Window"), _A("Text<Color>"), "+description"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00028/test_case.h b/tests/t00028/test_case.h
index 9d09e6c5..1ec2fdcf 100644
--- a/tests/t00028/test_case.h
+++ b/tests/t00028/test_case.h
@@ -55,6 +55,5 @@ note.)";
     REQUIRE_THAT(puml, !HasNote(_A("G"), "left", "G class note."));
     REQUIRE_THAT(puml, HasNote(_A("R"), "right", "R class note."));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00029/test_case.h b/tests/t00029/test_case.h
index b893e488..a44b9f09 100644
--- a/tests/t00029/test_case.h
+++ b/tests/t00029/test_case.h
@@ -53,6 +53,5 @@ TEST_CASE("t00029", "[test-case][class]")
     REQUIRE_THAT(puml, !IsAggregation(_A("R"), _A("G3"), "+g3"));
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("G4"), "+g4"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00030/test_case.h b/tests/t00030/test_case.h
index 80949e45..6d79326b 100644
--- a/tests/t00030/test_case.h
+++ b/tests/t00030/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t00030", "[test-case][class]")
     REQUIRE_THAT(puml, IsAssociation(_A("R"), _A("D"), "+ddd", "", "1"));
     REQUIRE_THAT(puml, IsAggregation(_A("R"), _A("E"), "+eee", "", "1"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00031/test_case.h b/tests/t00031/test_case.h
index 5c18ec98..80aae040 100644
--- a/tests/t00031/test_case.h
+++ b/tests/t00031/test_case.h
@@ -53,6 +53,5 @@ TEST_CASE("t00031", "[test-case][class]")
         IsAssociationWithStyle(
             _A("R"), _A("D"), "+ddd", "#blue,plain,thickness=16"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00032/test_case.h b/tests/t00032/test_case.h
index b5f0994e..1707d78b 100644
--- a/tests/t00032/test_case.h
+++ b/tests/t00032/test_case.h
@@ -51,6 +51,5 @@ TEST_CASE("t00032", "[test-case][class]")
     REQUIRE_THAT(puml, IsBaseClass(_A("B"), _A("Overload<TBase,int,A,B,C>")));
     REQUIRE_THAT(puml, IsBaseClass(_A("C"), _A("Overload<TBase,int,A,B,C>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00033/test_case.h b/tests/t00033/test_case.h
index 92ab70eb..71d55275 100644
--- a/tests/t00033/test_case.h
+++ b/tests/t00033/test_case.h
@@ -54,6 +54,5 @@ TEST_CASE("t00033", "[test-case][class]")
     REQUIRE_THAT(
         puml, IsInstantiation(_A("A<T>"), _A("A<B<std::unique_ptr<C<D>>>>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00034/test_case.h b/tests/t00034/test_case.h
index 26016195..7c27c778 100644
--- a/tests/t00034/test_case.h
+++ b/tests/t00034/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t00034", "[test-case][class]")
     REQUIRE_THAT(
         puml, IsInstantiation(_A("drop_void<T>"), _A("drop_void<Void>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00035/test_case.h b/tests/t00035/test_case.h
index 3b263cc6..19a10903 100644
--- a/tests/t00035/test_case.h
+++ b/tests/t00035/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t00035", "[test-case][class]")
     REQUIRE_THAT(puml, IsLayoutHint(_A("Center"), "right", _A("Right")));
     REQUIRE_THAT(puml, IsLayoutHint(_A("Center"), "down", _A("Bottom")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00036/test_case.h b/tests/t00036/test_case.h
index 0e011476..4e52ada0 100644
--- a/tests/t00036/test_case.h
+++ b/tests/t00036/test_case.h
@@ -45,6 +45,5 @@ TEST_CASE("t00036", "[test-case][class]")
 
     REQUIRE_THAT(puml, IsAggregation(_A("B"), _A("A<int>"), "+a_int"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00037/test_case.h b/tests/t00037/test_case.h
index 320a1bbe..786930c2 100644
--- a/tests/t00037/test_case.h
+++ b/tests/t00037/test_case.h
@@ -43,6 +43,5 @@ TEST_CASE("t00037", "[test-case][class]")
         puml, IsAggregation(_A("ST"), _A("ST::(dimensions)"), "+dimensions"));
     REQUIRE_THAT(puml, IsAggregation(_A("ST"), _A("ST::(units)"), "-units"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00038/test_case.h b/tests/t00038/test_case.h
index 6593ea2e..6e34c61b 100644
--- a/tests/t00038/test_case.h
+++ b/tests/t00038/test_case.h
@@ -91,6 +91,5 @@ TEST_CASE("t00038", "[test-case][class]")
             _A("map<std::integral_constant<thirdparty::ns1::color_t,"
                "thirdparty::ns1::color_t::red>>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00039/test_case.h b/tests/t00039/test_case.h
index 3431c2bf..970dc920 100644
--- a/tests/t00039/test_case.h
+++ b/tests/t00039/test_case.h
@@ -63,6 +63,5 @@ TEST_CASE("t00039", "[test-case][class]")
     REQUIRE_THAT(puml, IsClassTemplate("ns3::FE", "T,M"));
     REQUIRE_THAT(puml, IsClassTemplate("ns3::FFF", "T,M,N"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00040/test_case.h b/tests/t00040/test_case.h
index 1b91814b..122bbfbb 100644
--- a/tests/t00040/test_case.h
+++ b/tests/t00040/test_case.h
@@ -45,6 +45,5 @@ TEST_CASE("t00040", "[test-case][class]")
 
     REQUIRE_THAT(puml, !IsDependency(_A("R"), _A("A")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00041/test_case.h b/tests/t00041/test_case.h
index 65f56ffa..465c255b 100644
--- a/tests/t00041/test_case.h
+++ b/tests/t00041/test_case.h
@@ -62,6 +62,5 @@ TEST_CASE("t00041", "[test-case][class]")
     REQUIRE_THAT(puml, IsBaseClass(_A("ns1::N"), _A("ns1::NN")));
     REQUIRE_THAT(puml, IsBaseClass(_A("ns1::N"), _A("ns1::NM")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00042/test_case.h b/tests/t00042/test_case.h
index ace2c9b7..6084ec70 100644
--- a/tests/t00042/test_case.h
+++ b/tests/t00042/test_case.h
@@ -39,6 +39,5 @@ TEST_CASE("t00042", "[test-case][class]")
     REQUIRE_THAT(puml, IsClassTemplate("B", "T,K"));
     REQUIRE_THAT(puml, !IsClassTemplate("C", "T"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00043/test_case.h b/tests/t00043/test_case.h
index 131cef08..d9618427 100644
--- a/tests/t00043/test_case.h
+++ b/tests/t00043/test_case.h
@@ -62,6 +62,5 @@ TEST_CASE("t00043", "[test-case][class]")
     REQUIRE_THAT(puml, IsDependency(_A("I"), _A("H")));
     REQUIRE_THAT(puml, IsDependency(_A("J"), _A("I")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00044/test_case.h b/tests/t00044/test_case.h
index 8f98b0ba..e71fc749 100644
--- a/tests/t00044/test_case.h
+++ b/tests/t00044/test_case.h
@@ -39,6 +39,5 @@ TEST_CASE("t00044", "[test-case][class]")
     // Check dependants filter<void(int), bool>
     // REQUIRE_THAT(puml, IsClassTemplate("signal_handler", "Ret,Args...,A"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00045/test_case.h b/tests/t00045/test_case.h
index d78e1b49..1099a5b8 100644
--- a/tests/t00045/test_case.h
+++ b/tests/t00045/test_case.h
@@ -64,6 +64,5 @@ TEST_CASE("t00045", "[test-case][class]")
     // TODO:
     // REQUIRE_THAT(puml, IsFriend<Public>(_A("ns1::ns2::R"), _A("AAAA<T>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00046/test_case.h b/tests/t00046/test_case.h
index b6f7912a..a5d67acf 100644
--- a/tests/t00046/test_case.h
+++ b/tests/t00046/test_case.h
@@ -42,6 +42,6 @@ TEST_CASE("t00046", "[test-case][class]")
     REQUIRE_THAT(puml, IsClass(_A("R")));
 
     REQUIRE_THAT(puml, IsField<Public>("i", "std::vector<std::uint8_t>"));
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t00047/test_case.h b/tests/t00047/test_case.h
index 66e75d88..374243d7 100644
--- a/tests/t00047/test_case.h
+++ b/tests/t00047/test_case.h
@@ -42,6 +42,5 @@ TEST_CASE("t00047", "[test-case][class]")
     REQUIRE_THAT(puml,
         IsClassTemplate("conditional_t", "std::false_type,Result,Tail..."));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t00048/test_case.h b/tests/t00048/test_case.h
index f652bad9..9bf75981 100644
--- a/tests/t00048/test_case.h
+++ b/tests/t00048/test_case.h
@@ -48,6 +48,5 @@ TEST_CASE("t00048", "[test-case][class]")
     REQUIRE_THAT(puml, IsBaseClass(_A("Base"), _A("A")));
     REQUIRE_THAT(puml, IsBaseClass(_A("Base"), _A("B")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t00049/test_case.h b/tests/t00049/test_case.h
index c4cfc515..f17aa8d5 100644
--- a/tests/t00049/test_case.h
+++ b/tests/t00049/test_case.h
@@ -56,6 +56,5 @@ TEST_CASE("t00049", "[test-case][class]")
     REQUIRE_THAT(puml, IsInstantiation(_A("A<T>"), _A("A<thestring>")));
     REQUIRE_THAT(puml, IsInstantiation(_A("A<T>"), _A("A<intmap>")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t00050/test_case.h b/tests/t00050/test_case.h
index b7fe4109..442682e0 100644
--- a/tests/t00050/test_case.h
+++ b/tests/t00050/test_case.h
@@ -53,6 +53,5 @@ TEST_CASE("t00050", "[test-case][class]")
     REQUIRE_THAT(puml, HasNote(_A("G"), "bottom"));
     REQUIRE_THAT(puml, HasNote(_A("G"), "right"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20001/test_case.h b/tests/t20001/test_case.h
index 4799c97a..b14e887a 100644
--- a/tests/t20001/test_case.h
+++ b/tests/t20001/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t20001", "[test-case][sequence]")
 
     REQUIRE_THAT(puml, HasComment("t20001 test diagram of type sequence"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t20002/test_case.h b/tests/t20002/test_case.h
index 0967f912..39e7a1dd 100644
--- a/tests/t20002/test_case.h
+++ b/tests/t20002/test_case.h
@@ -38,6 +38,5 @@ TEST_CASE("t20002", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("m2()"), _A("m3()"), ""));
     REQUIRE_THAT(puml, HasCall(_A("m3()"), _A("m4()"), ""));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t20003/test_case.h b/tests/t20003/test_case.h
index 0d3ebb16..46e3d2db 100644
--- a/tests/t20003/test_case.h
+++ b/tests/t20003/test_case.h
@@ -38,6 +38,5 @@ TEST_CASE("t20003", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("m2<T>(T)"), _A("m3<T>(T)"), ""));
     REQUIRE_THAT(puml, HasCall(_A("m3<T>(T)"), _A("m4<T>(T)"), ""));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t20004/test_case.h b/tests/t20004/test_case.h
index f67bc340..de1ea0cd 100644
--- a/tests/t20004/test_case.h
+++ b/tests/t20004/test_case.h
@@ -56,6 +56,5 @@ TEST_CASE("t20004", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("m3<int>(int)"), _A("m4<int>(int)"), ""));
     REQUIRE_THAT(puml, EndsWith("@enduml\n"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20005/test_case.h b/tests/t20005/test_case.h
index d22b0e2c..c5d65d87 100644
--- a/tests/t20005/test_case.h
+++ b/tests/t20005/test_case.h
@@ -39,6 +39,5 @@ TEST_CASE("t20005", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("C<T>"), _A("B<T>"), "b(T)"));
     REQUIRE_THAT(puml, HasCall(_A("B<T>"), _A("A<T>"), "a(T)"));
     REQUIRE_THAT(puml, HasExitpoint(_A("C<T>")));
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20006/test_case.h b/tests/t20006/test_case.h
index e7a25810..8280336f 100644
--- a/tests/t20006/test_case.h
+++ b/tests/t20006/test_case.h
@@ -69,6 +69,5 @@ TEST_CASE("t20006", "[test-case][sequence]")
         HasCall(_A("BB<int,float>"), _A("BB<int,float>"), "bb2(int,float)"));
     REQUIRE_THAT(puml, HasCall(_A("BB<int,float>"), _A("AA<int>"), "aa2(int)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20007/test_case.h b/tests/t20007/test_case.h
index de94d5b6..504000cd 100644
--- a/tests/t20007/test_case.h
+++ b/tests/t20007/test_case.h
@@ -44,6 +44,5 @@ TEST_CASE("t20007", "[test-case][sequence]")
         HasCall(_A("tmain()"), _A("Adder<std::string,std::string,std::string>"),
             "add(std::string &&,std::string &&,std::string &&)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20008/test_case.h b/tests/t20008/test_case.h
index 9bda4062..663de6f7 100644
--- a/tests/t20008/test_case.h
+++ b/tests/t20008/test_case.h
@@ -51,6 +51,5 @@ TEST_CASE("t20008", "[test-case][sequence]")
     REQUIRE_THAT(puml,
         HasCall(_A("B<std::string>"), _A("A<std::string>"), "a3(std::string)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20009/test_case.h b/tests/t20009/test_case.h
index d67cb134..97dd7f83 100644
--- a/tests/t20009/test_case.h
+++ b/tests/t20009/test_case.h
@@ -45,6 +45,5 @@ TEST_CASE("t20009", "[test-case][sequence]")
 
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("B<float>"), "b(float)"));
     REQUIRE_THAT(puml, HasCall(_A("B<float>"), _A("A<float>"), "a(float)"));
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20010/test_case.h b/tests/t20010/test_case.h
index 7b928fbd..613cfd44 100644
--- a/tests/t20010/test_case.h
+++ b/tests/t20010/test_case.h
@@ -47,6 +47,5 @@ TEST_CASE("t20010", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("B<int>"), "b4()"));
     REQUIRE_THAT(puml, HasCall(_A("B<int>"), _A("A"), "a4()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20011/test_case.h b/tests/t20011/test_case.h
index 571f207b..0fd58f8c 100644
--- a/tests/t20011/test_case.h
+++ b/tests/t20011/test_case.h
@@ -43,6 +43,5 @@ TEST_CASE("t20011", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("A"), _A("A"), "d(int)"));
     REQUIRE_THAT(puml, HasCall(_A("A"), _A("A"), "b(int)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20012/test_case.h b/tests/t20012/test_case.h
index 71f1a1f1..b47b0954 100644
--- a/tests/t20012/test_case.h
+++ b/tests/t20012/test_case.h
@@ -76,6 +76,5 @@ TEST_CASE("t20012", "[test-case][sequence]")
 
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("D"), "add5(int)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20013/test_case.h b/tests/t20013/test_case.h
index ed2da262..f661971e 100644
--- a/tests/t20013/test_case.h
+++ b/tests/t20013/test_case.h
@@ -45,6 +45,5 @@ TEST_CASE("t20013", "[test-case][sequence]")
         puml, HasCall(_A("tmain(int,char **)"), _A("B"), "b(const char *)"));
     REQUIRE_THAT(puml, HasCall(_A("B"), _A("A"), "a3(const char *)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20014/test_case.h b/tests/t20014/test_case.h
index ab49e0f6..f7d7aeb9 100644
--- a/tests/t20014/test_case.h
+++ b/tests/t20014/test_case.h
@@ -44,6 +44,5 @@ TEST_CASE("t20014", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("C<B,int>"), "c1(int,int)"));
     REQUIRE_THAT(puml, HasCall(_A("C<B,int>"), _A("B"), "b1(int,int)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20015/test_case.h b/tests/t20015/test_case.h
index 4587898a..0794f8b4 100644
--- a/tests/t20015/test_case.h
+++ b/tests/t20015/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t20015", "[test-case][sequence]")
     REQUIRE_THAT(puml, !HasCall(_A("B"), _A("B"), "set_y(int)"));
     REQUIRE_THAT(puml, !HasCall(_A("B"), _A("B"), "set_z(int)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20016/test_case.h b/tests/t20016/test_case.h
index 11e020a3..a2f2c3f5 100644
--- a/tests/t20016/test_case.h
+++ b/tests/t20016/test_case.h
@@ -41,6 +41,5 @@ TEST_CASE("t20016", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("B<long>"), "b2(long)"));
     REQUIRE_THAT(puml, HasCall(_A("B<long>"), _A("A"), "a2(const long &)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20017/test_case.h b/tests/t20017/test_case.h
index dd1278d9..b48821d2 100644
--- a/tests/t20017/test_case.h
+++ b/tests/t20017/test_case.h
@@ -48,6 +48,5 @@ TEST_CASE("t20017", "[test-case][sequence]")
         HasCall(_A("t20017.cc"), _A("include/t20017_b.h"), "b2<int>(int,int)"));
     REQUIRE_THAT(puml, HasExitpoint(_A("t20017.cc")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20018/test_case.h b/tests/t20018/test_case.h
index 985d4722..675441ef 100644
--- a/tests/t20018/test_case.h
+++ b/tests/t20018/test_case.h
@@ -51,6 +51,5 @@ TEST_CASE("t20018", "[test-case][sequence]")
     REQUIRE_THAT(puml,
         HasCall(_A("Factorial<1>"), _A("Factorial<0>"), "__print(int)__"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20019/test_case.h b/tests/t20019/test_case.h
index ebc0e759..73eb87a8 100644
--- a/tests/t20019/test_case.h
+++ b/tests/t20019/test_case.h
@@ -40,6 +40,5 @@ TEST_CASE("t20019", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("Base<D2>"), "name()"));
     REQUIRE_THAT(puml, HasCall(_A("Base<D2>"), _A("D2"), "impl()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20020/test_case.h b/tests/t20020/test_case.h
index 2855a2e1..21beae59 100644
--- a/tests/t20020/test_case.h
+++ b/tests/t20020/test_case.h
@@ -50,6 +50,5 @@ TEST_CASE("t20020", "[test-case][sequence]")
     REQUIRE_THAT(
         puml, HasCallInControlCondition(_A("tmain()"), _A("C"), "c3(int)"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20021/test_case.h b/tests/t20021/test_case.h
index 24b01727..61e0c84f 100644
--- a/tests/t20021/test_case.h
+++ b/tests/t20021/test_case.h
@@ -57,6 +57,5 @@ TEST_CASE("t20021", "[test-case][sequence]")
     REQUIRE_THAT(
         puml, HasCallInControlCondition(_A("tmain()"), _A("C"), "contents()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20022/test_case.h b/tests/t20022/test_case.h
index 2f68ac04..6a12c019 100644
--- a/tests/t20022/test_case.h
+++ b/tests/t20022/test_case.h
@@ -38,6 +38,5 @@ TEST_CASE("t20022", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("A"), "a()"));
     REQUIRE_THAT(puml, HasCall(_A("A"), _A("B"), "b()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20023/test_case.h b/tests/t20023/test_case.h
index 82f50fd4..71e3b0bc 100644
--- a/tests/t20023/test_case.h
+++ b/tests/t20023/test_case.h
@@ -41,6 +41,5 @@ TEST_CASE("t20023", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("A"), _A("A"), "a3()"));
     REQUIRE_THAT(puml, HasCall(_A("A"), _A("A"), "a4()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20024/test_case.h b/tests/t20024/test_case.h
index acea65fc..5c432062 100644
--- a/tests/t20024/test_case.h
+++ b/tests/t20024/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t20024", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("B"), _A("B"), "orange()"));
     REQUIRE_THAT(puml, HasCall(_A("B"), _A("B"), "green()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20025/test_case.h b/tests/t20025/test_case.h
index 1c097c82..3874cd53 100644
--- a/tests/t20025/test_case.h
+++ b/tests/t20025/test_case.h
@@ -41,6 +41,5 @@ TEST_CASE("t20025", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("add(int,int)"), ""));
     REQUIRE_THAT(puml, !HasCall(_A("tmain()"), _A("add2(int,int)"), ""));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20026/test_case.h b/tests/t20026/test_case.h
index 324a348a..934d8ad2 100644
--- a/tests/t20026/test_case.h
+++ b/tests/t20026/test_case.h
@@ -37,6 +37,5 @@ TEST_CASE("t20026", "[test-case][sequence]")
     // Check if all calls exist
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("A"), "a()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20027/test_case.h b/tests/t20027/test_case.h
index 48b359dd..c8d807a6 100644
--- a/tests/t20027/test_case.h
+++ b/tests/t20027/test_case.h
@@ -39,6 +39,5 @@ TEST_CASE("t20027", "[test-case][sequence]")
     REQUIRE_THAT(puml, !HasCall(_A("A"), _A("A"), "aa()"));
     REQUIRE_THAT(puml, !HasCall(_A("A"), _A("A"), "aaa()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20028/test_case.h b/tests/t20028/test_case.h
index 44c7677d..6d97fb09 100644
--- a/tests/t20028/test_case.h
+++ b/tests/t20028/test_case.h
@@ -41,6 +41,5 @@ TEST_CASE("t20028", "[test-case][sequence]")
     REQUIRE_THAT(puml, HasCall(_A("tmain()"), _A("A"), "d()"));
     REQUIRE_THAT(puml, !HasCall(_A("tmain()"), _A("B"), "e()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t20029/test_case.h b/tests/t20029/test_case.h
index bf0b820f..cc63df20 100644
--- a/tests/t20029/test_case.h
+++ b/tests/t20029/test_case.h
@@ -56,6 +56,5 @@ TEST_CASE("t20029", "[test-case][sequence]")
     REQUIRE_THAT(puml,
         !HasCall(_A("ConnectionPool"), _A("ConnectionPool"), "connect_impl()"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file
diff --git a/tests/t30001/test_case.h b/tests/t30001/test_case.h
index 553b0666..9fc5ca7d 100644
--- a/tests/t30001/test_case.h
+++ b/tests/t30001/test_case.h
@@ -64,6 +64,5 @@ TEST_CASE("t30001", "[test-case][package]")
 
     REQUIRE_THAT(puml, HasComment("t30001 test diagram of type package"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30002/test_case.h b/tests/t30002/test_case.h
index 9a58f79d..e4ef8c77 100644
--- a/tests/t30002/test_case.h
+++ b/tests/t30002/test_case.h
@@ -69,6 +69,5 @@ TEST_CASE("t30002", "[test-case][package]")
     REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A16")));
     REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("A17")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30003/test_case.h b/tests/t30003/test_case.h
index 5ea54ed4..c9026838 100644
--- a/tests/t30003/test_case.h
+++ b/tests/t30003/test_case.h
@@ -43,6 +43,5 @@ TEST_CASE("t30003", "[test-case][package]")
     REQUIRE_THAT(puml, IsDeprecated(_A("ns2_v0_9_0")));
     REQUIRE_THAT(puml, IsDeprecated(_A("ns3")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30004/test_case.h b/tests/t30004/test_case.h
index 4dcd529e..6c471d87 100644
--- a/tests/t30004/test_case.h
+++ b/tests/t30004/test_case.h
@@ -40,6 +40,5 @@ TEST_CASE("t30004", "[test-case][package]")
     REQUIRE_THAT(puml, !IsPackage("DDD"));
     REQUIRE_THAT(puml, IsPackage("EEE"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30005/test_case.h b/tests/t30005/test_case.h
index 2d3fc166..3afa00ee 100644
--- a/tests/t30005/test_case.h
+++ b/tests/t30005/test_case.h
@@ -41,6 +41,5 @@ TEST_CASE("t30005", "[test-case][package]")
     REQUIRE_THAT(puml, IsDependency(_A("BBB"), _A("AAA")));
     REQUIRE_THAT(puml, IsDependency(_A("CCC"), _A("AAA")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30006/test_case.h b/tests/t30006/test_case.h
index 7b711888..9d7808ef 100644
--- a/tests/t30006/test_case.h
+++ b/tests/t30006/test_case.h
@@ -41,6 +41,5 @@ TEST_CASE("t30006", "[test-case][package]")
     REQUIRE_THAT(puml, IsDependency(_A("A"), _A("B")));
     REQUIRE_THAT(puml, IsDependency(_A("A"), _A("C")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30007/test_case.h b/tests/t30007/test_case.h
index 9d1dbbbd..1fbb7399 100644
--- a/tests/t30007/test_case.h
+++ b/tests/t30007/test_case.h
@@ -44,6 +44,5 @@ TEST_CASE("t30007", "[test-case][package]")
     REQUIRE_THAT(puml, IsLayoutHint(_A("C"), "up", _A("AA")));
     REQUIRE_THAT(puml, IsLayoutHint(_A("C"), "left", _A("B")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t30008/test_case.h b/tests/t30008/test_case.h
index 70bae7b8..c14d183f 100644
--- a/tests/t30008/test_case.h
+++ b/tests/t30008/test_case.h
@@ -50,6 +50,5 @@ TEST_CASE("t30008", "[test-case][package]")
     REQUIRE_THAT(puml, IsDependency(_A("E"), _A("D")));
     REQUIRE_THAT(puml, IsDependency(_A("F"), _A("E")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t40001/test_case.h b/tests/t40001/test_case.h
index a9c9352d..2ed7621f 100644
--- a/tests/t40001/test_case.h
+++ b/tests/t40001/test_case.h
@@ -50,6 +50,5 @@ TEST_CASE("t40001", "[test-case][include]")
 
     REQUIRE_THAT(puml, HasComment("t40001 test diagram of type include"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t40002/test_case.h b/tests/t40002/test_case.h
index fa5357fc..0f6451b4 100644
--- a/tests/t40002/test_case.h
+++ b/tests/t40002/test_case.h
@@ -79,6 +79,5 @@ TEST_CASE("t40002", "[test-case][include]")
                 clanguml::util::get_git_commit()),
             "lib2.h"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t40003/test_case.h b/tests/t40003/test_case.h
index 8c240777..e45cbea9 100644
--- a/tests/t40003/test_case.h
+++ b/tests/t40003/test_case.h
@@ -46,6 +46,5 @@ TEST_CASE("t40003", "[test-case][include]")
     REQUIRE_THAT(puml, IsFile("t5.h"));
     REQUIRE_THAT(puml, !IsFile("t6.h"));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/t90000/test_case.h b/tests/t90000/test_case.h
index 3f40682f..5074f76e 100644
--- a/tests/t90000/test_case.h
+++ b/tests/t90000/test_case.h
@@ -35,6 +35,5 @@ TEST_CASE("t90000", "[test-case][config]")
     REQUIRE_THAT(puml, IsClass(_A("Foo")));
     REQUIRE_THAT(puml, IsClass(_A("Boo")));
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index 927ac6d2..c267fdbd 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -35,7 +35,7 @@ std::pair<clanguml::config::config,
     std::unique_ptr<clang::tooling::CompilationDatabase>>
 load_config(const std::string &test_name)
 {
-    auto config = clanguml::config::load(test_name + "/.clang-uml");
+    auto config = clanguml::config::load(test_name + "/.clang-uml", true);
 
     std::string err{};
     auto compilation_database =
@@ -62,7 +62,7 @@ generate_sequence_diagram(clang::tooling::CompilationDatabase &db,
     auto model = clanguml::common::generators::plantuml::generate<diagram_model,
         diagram_config, diagram_visitor>(db, diagram->name,
         dynamic_cast<clanguml::config::sequence_diagram &>(*diagram),
-        diagram->get_translation_units(std::filesystem::current_path()));
+        diagram->get_translation_units());
 
     return model;
 }
@@ -81,7 +81,7 @@ std::unique_ptr<clanguml::class_diagram::model::diagram> generate_class_diagram(
     auto model = clanguml::common::generators::plantuml::generate<diagram_model,
         diagram_config, diagram_visitor>(db, diagram->name,
         dynamic_cast<diagram_config &>(*diagram),
-        diagram->get_translation_units(std::filesystem::current_path()));
+        diagram->get_translation_units());
 
     return model;
 }
@@ -100,7 +100,7 @@ generate_package_diagram(clang::tooling::CompilationDatabase &db,
     return clanguml::common::generators::plantuml::generate<diagram_model,
         diagram_config, diagram_visitor>(db, diagram->name,
         dynamic_cast<diagram_config &>(*diagram),
-        diagram->get_translation_units(std::filesystem::current_path()));
+        diagram->get_translation_units());
 }
 
 std::unique_ptr<clanguml::include_diagram::model::diagram>
@@ -117,7 +117,7 @@ generate_include_diagram(clang::tooling::CompilationDatabase &db,
     return clanguml::common::generators::plantuml::generate<diagram_model,
         diagram_config, diagram_visitor>(db, diagram->name,
         dynamic_cast<diagram_config &>(*diagram),
-        diagram->get_translation_units(std::filesystem::current_path()));
+        diagram->get_translation_units());
 }
 
 std::string generate_sequence_puml(
diff --git a/tests/test_util.cc b/tests/test_util.cc
index 9c067fff..be4bb2cd 100644
--- a/tests/test_util.cc
+++ b/tests/test_util.cc
@@ -228,6 +228,18 @@ TEST_CASE("Test path_to_url", "[unit-test]")
 #endif
 }
 
+TEST_CASE("Test ensure_path_is_absolute", "[unit-test]")
+{
+    using namespace clanguml::util;
+
+    CHECK(ensure_path_is_absolute("a/b/c", "/tmp").string() == "/tmp/a/b/c");
+    CHECK(ensure_path_is_absolute("/a/b/c", "/tmp").string() == "/a/b/c");
+    CHECK(ensure_path_is_absolute("", "/tmp").string() == "/tmp/");
+    CHECK(ensure_path_is_absolute(".", "/tmp").string() == "/tmp/");
+    CHECK(ensure_path_is_absolute("..", "/tmp").string() == "/");
+    CHECK(ensure_path_is_absolute("/", "/tmp").string() == "/");
+}
+
 TEST_CASE("Test hash_seed", "[unit-test]")
 {
     using namespace clanguml::util;

From 61dcf9ef043abb69a7e42f29baf71ef2adb53728 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 21 Jan 2023 20:30:14 +0100
Subject: [PATCH 03/11] Updated docs

---
 docs/configuration_file.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/configuration_file.md b/docs/configuration_file.md
index 26397e64..136db40a 100644
--- a/docs/configuration_file.md
+++ b/docs/configuration_file.md
@@ -5,6 +5,7 @@
 * [Top level options](#top-level-options)
   * [Diagram options](#diagram-options)
 * [Example complete config](#example-complete-config)
+* [Paths](#paths)
 
 <!-- tocstop -->
 
@@ -113,4 +114,20 @@ diagrams:
       # Add this line to the beginning of the resulting puml file
       before:
         - 'title clang-uml class diagram model'
-```
\ No newline at end of file
+```
+
+## Paths
+By default, all paths specified in the configuration file, including:
+
+* `glob`
+* `output_directory`
+* `compilation_database_dir`
+* `paths` filter
+
+are relative to the parent directory of the configuration file. This can be
+changed in the following ways:
+* by specifying `relative_to` option in the configuration file
+* by providing `--paths-relative-to-pwd` command line option, in which
+  case all paths will be relative to the directory where `clang-uml` is
+  executed (this only makes sense for automation where `clang-uml` is executed
+  from the same location relative to the project directory
\ No newline at end of file

From b5cf78ce82037c53f65864b6811c2771fc2c810d Mon Sep 17 00:00:00 2001
From: bram <bram@users.noreply.github.com>
Date: Sun, 8 Jan 2023 20:58:59 +0100
Subject: [PATCH 04/11] Fix for segfault in path::pop_back

---
 src/common/model/path.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/model/path.h b/src/common/model/path.h
index 9846f268..1790fc1c 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -128,7 +128,13 @@ public:
         }
     }
 
-    void pop_back() { path_.pop_back(); }
+    void pop_back()
+    {
+        if (!path_.empty())
+        {
+            path_.pop_back();
+        }
+    }
 
     std::optional<path> parent() const
     {

From 023a4a0cc082777a5336890be455baca023d25a6 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 21 Jan 2023 23:23:13 +0100
Subject: [PATCH 05/11] Fixed generation of lambda names in class diagrams
 (#78)

---
 .../visitor/translation_unit_visitor.cc       | 46 +++++++++++---
 .../visitor/translation_unit_visitor.h        |  1 +
 src/util/util.h                               |  3 +-
 tests/t00051/.clang-uml                       | 12 ++++
 tests/t00051/t00051.cc                        | 63 +++++++++++++++++++
 tests/t00051/test_case.h                      | 57 +++++++++++++++++
 tests/test_cases.cc                           |  1 +
 tests/test_cases.yaml                         |  3 +
 util/templates/test_cases/test_case.h         |  3 +-
 9 files changed, 176 insertions(+), 13 deletions(-)
 create mode 100644 tests/t00051/.clang-uml
 create mode 100644 tests/t00051/t00051.cc
 create mode 100644 tests/t00051/test_case.h

diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index ea11207d..40ba3063 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -828,9 +828,13 @@ void translation_unit_visitor::process_method(
     if (mf.isDefaulted() && !mf.isExplicitlyDefaulted())
         return;
 
+    auto method_return_type =
+        common::to_string(mf.getReturnType(), mf.getASTContext());
+
+    ensure_lambda_type_is_relative(method_return_type);
+
     class_method method{common::access_specifier_to_access_t(mf.getAccess()),
-        util::trim(mf.getNameAsString()),
-        common::to_string(mf.getReturnType(), mf.getASTContext())};
+        util::trim(mf.getNameAsString()), std::move(method_return_type)};
 
     method.is_pure_virtual(mf.isPure());
     method.is_virtual(mf.isVirtual());
@@ -923,13 +927,6 @@ bool translation_unit_visitor::find_relationships(const clang::QualType &type,
         const auto *type_instantiation_decl =
             type->getAs<clang::TemplateSpecializationType>();
 
-        //        if (type_instantiation_decl != nullptr) {
-        //            if (type_instantiation_decl->isTypeAlias())
-        //                type_instantiation_decl =
-        //                    type_instantiation_decl->getAliasedType()
-        //                        ->getAs<clang::TemplateSpecializationType>();
-        //        }
-
         if (type_instantiation_decl != nullptr) {
             for (const auto &template_argument : *type_instantiation_decl) {
                 const auto template_argument_kind = template_argument.getKind();
@@ -996,7 +993,12 @@ void translation_unit_visitor::process_function_parameter(
     if (parameter.skip())
         return;
 
-    parameter.set_type(common::to_string(p.getType(), p.getASTContext()));
+    auto parameter_type = common::to_string(p.getType(), p.getASTContext());
+
+    // Is there no better way to determine that 'type' is a lambda?
+    ensure_lambda_type_is_relative(parameter_type);
+
+    parameter.set_type(parameter_type);
 
     if (p.hasDefaultArg()) {
         const auto *default_arg = p.getDefaultArg();
@@ -1048,6 +1050,30 @@ void translation_unit_visitor::process_function_parameter(
     method.add_parameter(std::move(parameter));
 }
 
+void translation_unit_visitor::ensure_lambda_type_is_relative(
+    std::string &parameter_type) const
+{
+    std::string lambda_prefix{"(lambda at /"};
+
+    while (parameter_type.find(lambda_prefix) != std::string::npos) {
+        auto lambda_begin = parameter_type.find(lambda_prefix);
+
+        auto absolute_lambda_path_end = parameter_type.find(":", lambda_begin);
+        auto absolute_lambda_path =
+            parameter_type.substr(lambda_begin + lambda_prefix.size() - 1,
+                absolute_lambda_path_end -
+                    (lambda_begin + lambda_prefix.size() - 1));
+
+        auto relative_lambda_path = std::filesystem::relative(
+            absolute_lambda_path, config().relative_to())
+                                        .string();
+
+        parameter_type = fmt::format("{}(lambda at {}{}",
+            parameter_type.substr(0, lambda_begin), relative_lambda_path,
+            parameter_type.substr(absolute_lambda_path_end));
+    }
+}
+
 void translation_unit_visitor::
     process_function_parameter_find_relationships_in_template(class_ &c,
         const std::set<std::string> & /*template_parameter_names*/,
diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
index 02778238..b7c4bde4 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -254,5 +254,6 @@ private:
         std::tuple<std::string /* field name */, common::model::relationship_t,
             common::model::access_t>>
         anonymous_struct_relationships_;
+    void ensure_lambda_type_is_relative(std::string &parameter_type) const;
 };
 } // namespace clanguml::class_diagram::visitor
diff --git a/src/util/util.h b/src/util/util.h
index 96e39fbf..03c853f1 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -162,7 +162,8 @@ template <>
 bool starts_with(
     const std::filesystem::path &path, const std::filesystem::path &prefix);
 
-template <> bool starts_with(const std::string &s, const std::string &prefix);
+template <>
+bool starts_with(const std::string &s, const std::string &prefix);
 
 template <typename T> bool ends_with(const T &value, const T &suffix);
 
diff --git a/tests/t00051/.clang-uml b/tests/t00051/.clang-uml
new file mode 100644
index 00000000..4cb46059
--- /dev/null
+++ b/tests/t00051/.clang-uml
@@ -0,0 +1,12 @@
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t00051_class:
+    type: class
+    glob:
+      - ../../tests/t00051/t00051.cc
+    include:
+      namespaces:
+        - clanguml::t00051
+    using_namespace:
+      - clanguml::t00051
\ No newline at end of file
diff --git a/tests/t00051/t00051.cc b/tests/t00051/t00051.cc
new file mode 100644
index 00000000..a9578fcb
--- /dev/null
+++ b/tests/t00051/t00051.cc
@@ -0,0 +1,63 @@
+#include <thread>
+
+namespace clanguml {
+namespace t00051 {
+
+template <typename F, typename FF = F> struct B : private std::thread {
+    B(F &&f, FF &&ff)
+        : f_{std::move(f)}
+        , ff_{std::move(ff)}
+    {
+    }
+
+    void f() { f_(); }
+    void ff() { ff_(); }
+
+    F f_;
+    FF ff_;
+};
+
+class A {
+public:
+private:
+    class custom_thread1 : private std::thread {
+    public:
+        template <class Function, class... Args>
+        explicit custom_thread1(Function &&f, Args &&...args)
+            : std::thread::thread(
+                  std::forward<Function>(f), std::forward<Args>(args)...)
+        {
+        }
+    };
+
+    static custom_thread1 start_thread1();
+
+    class custom_thread2 : private std::thread {
+        using std::thread::thread;
+    };
+
+    static custom_thread2 start_thread2();
+
+    auto start_thread3()
+    {
+        return B{[]() {}, []() {}};
+    }
+
+    auto get_function()
+    {
+        return []() {};
+    }
+};
+
+A::custom_thread1 A::start_thread1()
+{
+    return custom_thread1{[]() {}};
+}
+
+A::custom_thread2 A::start_thread2()
+{
+    return custom_thread2{[]() {}};
+}
+
+}
+}
diff --git a/tests/t00051/test_case.h b/tests/t00051/test_case.h
new file mode 100644
index 00000000..54400afd
--- /dev/null
+++ b/tests/t00051/test_case.h
@@ -0,0 +1,57 @@
+/**
+ * tests/t00051/test_case.h
+ *
+ * Copyright (c) 2021-2023 Bartek Kryza <bkryza@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+TEST_CASE("t00051", "[test-case][class]")
+{
+    auto [config, db] = load_config("t00051");
+
+    auto diagram = config.diagrams["t00051_class"];
+
+    REQUIRE(diagram->name == "t00051_class");
+
+    auto model = generate_class_diagram(*db, diagram);
+
+    REQUIRE(model->name() == "t00051_class");
+
+    auto puml = generate_class_puml(diagram, *model);
+    AliasMatcher _A(puml);
+
+    REQUIRE_THAT(puml, StartsWith("@startuml"));
+    REQUIRE_THAT(puml, EndsWith("@enduml\n"));
+
+    // Check if all classes exist
+    REQUIRE_THAT(puml, IsClass(_A("A")));
+    REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("A::custom_thread1")));
+    REQUIRE_THAT(puml, IsInnerClass(_A("A"), _A("A::custom_thread2")));
+
+    REQUIRE_THAT(puml,
+        (IsMethod<Public>(
+            "custom_thread1", "void", "Function && f, Args &&... args")));
+    REQUIRE_THAT(puml,
+        (IsMethod<Public>("thread", "void",
+            "(lambda at ../../tests/t00051/t00051.cc:59:27) && ")));
+    REQUIRE_THAT(puml,
+        (IsMethod<Private>("start_thread3",
+            "B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
+            "../../tests/t00051/t00051.cc:43:27)>")));
+    REQUIRE_THAT(puml,
+        (IsMethod<Private>(
+            "get_function", "(lambda at ../../tests/t00051/t00051.cc:48:16)")));
+
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
+}
\ No newline at end of file
diff --git a/tests/test_cases.cc b/tests/test_cases.cc
index c267fdbd..3fd9bce1 100644
--- a/tests/test_cases.cc
+++ b/tests/test_cases.cc
@@ -244,6 +244,7 @@ using namespace clanguml::test::matchers;
 #include "t00048/test_case.h"
 #include "t00049/test_case.h"
 #include "t00050/test_case.h"
+#include "t00051/test_case.h"
 
 ///
 /// Sequence diagram tests
diff --git a/tests/test_cases.yaml b/tests/test_cases.yaml
index 880825fd..105de191 100644
--- a/tests/test_cases.yaml
+++ b/tests/test_cases.yaml
@@ -147,6 +147,9 @@ test_cases:
     - name: t00050
       title: Test case for generating notes from comments using jinja templates
       description:
+    - name: t00051
+      title: Test case for relative paths in lambda names
+      description:
   Sequence diagrams:
     - name: t20001
       title: Basic sequence diagram test case
diff --git a/util/templates/test_cases/test_case.h b/util/templates/test_cases/test_case.h
index 34a5811e..83ed5856 100644
--- a/util/templates/test_cases/test_case.h
+++ b/util/templates/test_cases/test_case.h
@@ -36,6 +36,5 @@ TEST_CASE("{{ name }}", "[test-case][{{ type }}]")
 
     {{ examples }}
 
-    save_puml(
-        "./" + config.output_directory() + "/" + diagram->name + ".puml", puml);
+    save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }

From 3005ad7c374ad029826c71c4204bd4929bef2f83 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sat, 21 Jan 2023 23:23:36 +0100
Subject: [PATCH 06/11] Fixed formatting

---
 src/common/model/path.h | 3 +--
 src/util/util.h         | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/common/model/path.h b/src/common/model/path.h
index 1790fc1c..cda01bd5 100644
--- a/src/common/model/path.h
+++ b/src/common/model/path.h
@@ -130,8 +130,7 @@ public:
 
     void pop_back()
     {
-        if (!path_.empty())
-        {
+        if (!path_.empty()) {
             path_.pop_back();
         }
     }
diff --git a/src/util/util.h b/src/util/util.h
index 03c853f1..96e39fbf 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -162,8 +162,7 @@ template <>
 bool starts_with(
     const std::filesystem::path &path, const std::filesystem::path &prefix);
 
-template <>
-bool starts_with(const std::string &s, const std::string &prefix);
+template <> bool starts_with(const std::string &s, const std::string &prefix);
 
 template <typename T> bool ends_with(const T &value, const T &suffix);
 

From 8deaf0246bfc19cb4de9c60cc17d9af444d479c1 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 22 Jan 2023 13:34:37 +0100
Subject: [PATCH 07/11] Fixed handling of lambda names in auto types in class
 diagrams (#78,#82)

---
 CHANGELOG.md                                  |   6 +-
 .../visitor/translation_unit_visitor.cc       | 117 ++++++++++++++++--
 .../visitor/translation_unit_visitor.h        |   6 +-
 tests/t00051/test_case.h                      |  19 +++
 4 files changed, 137 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78ce17b6..845bc1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
-
+  
+  * Added relationship deduction from `auto` return types which are template
+    specializations (#82)
+  * Fixed lambda names in class diagrams to be based on relative paths
+    with respect to `relative_to` config option (#78)
   * Fixed relative paths in config files to be relative to the parent of
     the configuration file by default (#69)
   * Added command line option (--dump-config) to print effective config (#77)
diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 40ba3063..129cbd44 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -834,7 +834,7 @@ void translation_unit_visitor::process_method(
     ensure_lambda_type_is_relative(method_return_type);
 
     class_method method{common::access_specifier_to_access_t(mf.getAccess()),
-        util::trim(mf.getNameAsString()), std::move(method_return_type)};
+        util::trim(mf.getNameAsString()), method_return_type};
 
     method.is_pure_virtual(mf.isPure());
     method.is_virtual(mf.isVirtual());
@@ -852,11 +852,101 @@ void translation_unit_visitor::process_method(
             process_function_parameter(*param, method, c);
     }
 
+    //  find relationship for return type
+    found_relationships_t relationships;
+
+    find_relationships(
+        mf.getReturnType(), relationships, relationship_t::kDependency);
+
+    for (const auto &[type_element_id, relationship_type] : relationships) {
+        if (type_element_id != c.id() &&
+            (relationship_type != relationship_t::kNone)) {
+            relationship r{relationship_t::kDependency, type_element_id};
+
+            LOG_DBG("Adding method return type relationship from {}::{} to "
+                    "{}: {}",
+                c.full_name(), mf.getNameAsString(),
+                clanguml::common::model::to_string(r.type()), r.label());
+
+            c.add_relationship(std::move(r));
+        }
+    }
+
+    // Also consider the container itself if it is a template
+    // instantiation it's arguments could count as reference to relevant
+    // types
+    auto underlying_type = mf.getReturnType();
+    if (underlying_type->isReferenceType())
+        underlying_type = underlying_type.getNonReferenceType();
+    if (underlying_type->isPointerType())
+        underlying_type = underlying_type->getPointeeType();
+
+    if (const auto *tsp =
+            underlying_type->getAs<clang::TemplateSpecializationType>();
+        tsp != nullptr) {
+        process_function_parameter_find_relationships_in_template(c, {}, *tsp);
+    }
+    else if (const auto *atsp = underlying_type->getAs<clang::AutoType>();
+             atsp != nullptr) {
+        process_function_parameter_find_relatinoships_in_autotype(c, atsp);
+    }
+
     LOG_DBG("Adding method: {}", method.name());
 
     c.add_method(std::move(method));
 }
 
+void translation_unit_visitor::
+    process_function_parameter_find_relatinoships_in_autotype(
+        class_ &c, const clang::AutoType *atsp)
+{
+    auto desugared_atsp = atsp->getDeducedType();
+
+    if (atsp->isSugared()) {
+        const auto *deduced_type =
+            atsp->desugar()->getAs<clang::DeducedTemplateSpecializationType>();
+
+        if (deduced_type != nullptr)
+            desugared_atsp = deduced_type->getDeducedType();
+    }
+
+    const auto *deduced_record_type =
+        desugared_atsp->getAs<clang::RecordType>();
+
+    if (deduced_record_type != nullptr) {
+        if (auto *deduced_auto_decl =
+                llvm::dyn_cast_or_null<clang::ClassTemplateSpecializationDecl>(
+                    deduced_record_type->getDecl());
+            deduced_auto_decl != nullptr) {
+
+            const auto diagram_class_count_before_visit =
+                diagram().classes().size();
+
+            VisitClassTemplateSpecializationDecl(deduced_auto_decl);
+
+            const bool visitor_added_new_template_specialization =
+                (diagram().classes().size() -
+                    diagram_class_count_before_visit) > 0;
+
+            if (visitor_added_new_template_specialization) {
+                const auto &template_specialization_model =
+                    diagram().classes().back();
+
+                const auto template_field_decl_name =
+                    deduced_auto_decl->getQualifiedNameAsString();
+
+                if (diagram().should_include(template_field_decl_name)) {
+
+                    relationship r{relationship_t::kDependency,
+                        template_specialization_model.get().id()};
+
+                    c.add_relationship(std::move(r));
+                }
+            }
+        }
+    }
+}
+
 void translation_unit_visitor::process_template_method(
     const clang::FunctionTemplateDecl &mf, class_ &c)
 {
@@ -1058,7 +1148,7 @@ void translation_unit_visitor::ensure_lambda_type_is_relative(
     while (parameter_type.find(lambda_prefix) != std::string::npos) {
         auto lambda_begin = parameter_type.find(lambda_prefix);
 
-        auto absolute_lambda_path_end = parameter_type.find(":", lambda_begin);
+        auto absolute_lambda_path_end = parameter_type.find(':', lambda_begin);
         auto absolute_lambda_path =
             parameter_type.substr(lambda_begin + lambda_prefix.size() - 1,
                 absolute_lambda_path_end -
@@ -1290,6 +1380,7 @@ void translation_unit_visitor::process_template_specialization_argument(
         else {
             auto type_name =
                 common::to_string(arg.getAsType(), cls->getASTContext());
+            ensure_lambda_type_is_relative(type_name);
             if (type_name.find('<') != std::string::npos) {
                 // Sometimes template instantiation is reported as
                 // RecordType in the AST and getAs to
@@ -1302,7 +1393,11 @@ void translation_unit_visitor::process_template_specialization_argument(
                         type_name.size() - (type_name.find('<') + 2)),
                     argument, template_instantiation);
 
-                argument.set_name(type_name.substr(0, type_name.find('<')));
+                auto unexposed_type_name =
+                    type_name.substr(0, type_name.find('<'));
+                ensure_lambda_type_is_relative(unexposed_type_name);
+
+                argument.set_name(unexposed_type_name);
             }
             else if (type_name.find("type-parameter-") == 0) {
                 auto declaration_text = common::get_source_text_raw(
@@ -1329,8 +1424,9 @@ void translation_unit_visitor::process_template_specialization_argument(
                 // whatever clang says
                 argument.set_name(type_name);
             }
-            else
+            else {
                 argument.set_name(type_name);
+            }
         }
 
         LOG_DBG("Adding template instantiation argument {}",
@@ -1527,8 +1623,9 @@ std::unique_ptr<class_> translation_unit_visitor::build_template_instantiation(
     const auto *template_type_ptr = &template_type_decl;
 
     if (template_type_decl.isTypeAlias()) {
-        if (const auto *tsp = template_type_decl.getAliasedType()
-                                  ->getAs<clang::TemplateSpecializationType>();
+        if (const auto *tsp =
+                template_type_decl.getAliasedType()
+                    ->template getAs<clang::TemplateSpecializationType>();
             tsp != nullptr)
             template_type_ptr = tsp;
     }
@@ -2006,11 +2103,13 @@ void translation_unit_visitor::process_field(
     // The field name
     const auto field_name = field_declaration.getNameAsString();
 
+    auto field_type_str =
+        common::to_string(field_type, field_declaration.getASTContext(), false);
+    ensure_lambda_type_is_relative(field_type_str);
+
     class_member field{
         common::access_specifier_to_access_t(field_declaration.getAccess()),
-        field_name,
-        common::to_string(
-            field_type, field_declaration.getASTContext(), false)};
+        field_name, field_type_str};
 
     // Parse the field comment
     process_comment(field_declaration, field);
diff --git a/src/class_diagram/visitor/translation_unit_visitor.h b/src/class_diagram/visitor/translation_unit_visitor.h
index b7c4bde4..0e7dcfe8 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.h
+++ b/src/class_diagram/visitor/translation_unit_visitor.h
@@ -208,6 +208,11 @@ private:
         const clang::TemplateArgument &arg,
         model::template_parameter &argument) const;
 
+    void ensure_lambda_type_is_relative(std::string &parameter_type) const;
+
+    void process_function_parameter_find_relatinoships_in_autotype(
+        model::class_ &c, const clang::AutoType *atsp);
+
     void process_function_parameter_find_relationships_in_template(
         clanguml::class_diagram::model::class_ &c,
         const std::set<std::string> &template_parameter_names,
@@ -254,6 +259,5 @@ private:
         std::tuple<std::string /* field name */, common::model::relationship_t,
             common::model::access_t>>
         anonymous_struct_relationships_;
-    void ensure_lambda_type_is_relative(std::string &parameter_type) const;
 };
 } // namespace clanguml::class_diagram::visitor
diff --git a/tests/t00051/test_case.h b/tests/t00051/test_case.h
index 54400afd..edd2a731 100644
--- a/tests/t00051/test_case.h
+++ b/tests/t00051/test_case.h
@@ -53,5 +53,24 @@ TEST_CASE("t00051", "[test-case][class]")
         (IsMethod<Private>(
             "get_function", "(lambda at ../../tests/t00051/t00051.cc:48:16)")));
 
+    REQUIRE_THAT(puml, IsClassTemplate("B", "F,FF"));
+    REQUIRE_THAT(puml, (IsMethod<Public>("f", "void")));
+    REQUIRE_THAT(puml, (IsMethod<Public>("ff", "void")));
+
+    REQUIRE_THAT(puml,
+        IsClassTemplate("B",
+            "(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
+            "../../tests/t00051/t00051.cc:43:27)"));
+
+    REQUIRE_THAT(puml,
+        IsInstantiation(_A("B<F,FF>"),
+            _A("B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
+               "../../tests/t00051/t00051.cc:43:27)>")));
+
+    REQUIRE_THAT(puml,
+        IsDependency(_A("A"),
+            _A("B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at "
+               "../../tests/t00051/t00051.cc:43:27)>")));
+
     save_puml(config.output_directory() + "/" + diagram->name + ".puml", puml);
 }
\ No newline at end of file

From e0a42be63adccd5295f3cc6998eb41a2faaf581c Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 22 Jan 2023 13:59:08 +0100
Subject: [PATCH 08/11] Updated test cases documentation

---
 docs/test_cases.md                  |  12 +-
 docs/test_cases/t00002_class.svg    |  36 ++---
 docs/test_cases/t00003_class.svg    |  46 +++---
 docs/test_cases/t00004_class.svg    |  76 ++++-----
 docs/test_cases/t00005_class.svg    | 110 ++++++-------
 docs/test_cases/t00006_class.svg    | 132 +++++++--------
 docs/test_cases/t00007_class.svg    |  30 ++--
 docs/test_cases/t00008_class.svg    |  56 +++----
 docs/test_cases/t00009_class.svg    |  32 ++--
 docs/test_cases/t00010_class.svg    |  34 ++--
 docs/test_cases/t00011_class.svg    |  22 +--
 docs/test_cases/t00012_class.svg    |  66 ++++----
 docs/test_cases/t00013_class.svg    |  82 +++++-----
 docs/test_cases/t00014_class.svg    | 116 +++++++-------
 docs/test_cases/t00015_class.svg    |  22 +--
 docs/test_cases/t00016_class.svg    |  30 ++--
 docs/test_cases/t00017_class.svg    |  66 ++++----
 docs/test_cases/t00018_class.svg    |  18 +--
 docs/test_cases/t00019_class.svg    |  40 ++---
 docs/test_cases/t00020_class.svg    | 238 +++++++++++++++-------------
 docs/test_cases/t00021_class.svg    |  30 ++--
 docs/test_cases/t00022_class.svg    |  14 +-
 docs/test_cases/t00023_class.svg    |  26 +--
 docs/test_cases/t00024_class.svg    |  22 +--
 docs/test_cases/t00025_class.svg    |  34 ++--
 docs/test_cases/t00026_class.svg    |  42 ++---
 docs/test_cases/t00027_class.svg    |  58 +++----
 docs/test_cases/t00028_class.svg    |  82 +++++-----
 docs/test_cases/t00029_class.svg    |  50 +++---
 docs/test_cases/t00030_class.svg    |  46 +++---
 docs/test_cases/t00031_class.svg    |  50 +++---
 docs/test_cases/t00032_class.svg    |  40 ++---
 docs/test_cases/t00033_class.svg    |  48 +++---
 docs/test_cases/t00034_class.svg    |  46 +++---
 docs/test_cases/t00035_class.svg    |  22 +--
 docs/test_cases/t00036_class.svg    |  38 ++---
 docs/test_cases/t00037_class.svg    |  54 +++----
 docs/test_cases/t00038_class.svg    |  58 +++----
 docs/test_cases/t00039_class.svg    |  78 ++++-----
 docs/test_cases/t00040_class.svg    |  26 +--
 docs/test_cases/t00041_class.svg    |  54 +++----
 docs/test_cases/t00042_class.svg    |  36 ++---
 docs/test_cases/t00043_class.svg    |  50 +++---
 docs/test_cases/t00044_class.svg    |  36 ++---
 docs/test_cases/t00045_class.svg    |  70 ++++----
 docs/test_cases/t00046_class.svg    |  64 ++++----
 docs/test_cases/t00047_class.svg    |  22 +--
 docs/test_cases/t00048_class.svg    |  50 +++---
 docs/test_cases/t00049_class.svg    |  32 ++--
 docs/test_cases/t00050_class.svg    |  72 ++++-----
 docs/test_cases/t00051.md           |  86 ++++++++++
 docs/test_cases/t00051_class.svg    | 119 ++++++++++++++
 docs/test_cases/t20001_sequence.svg |  62 ++++----
 docs/test_cases/t20002_sequence.svg |  48 +++---
 docs/test_cases/t20003_sequence.svg |  48 +++---
 docs/test_cases/t20004_sequence.svg | 120 +++++++-------
 docs/test_cases/t20005_sequence.svg |  36 ++---
 docs/test_cases/t20006_sequence.svg | 150 +++++++++---------
 docs/test_cases/t20007_sequence.svg |  48 +++---
 docs/test_cases/t20008_sequence.svg |  84 +++++-----
 docs/test_cases/t20009_sequence.svg |  84 +++++-----
 docs/test_cases/t20010_sequence.svg |  72 ++++-----
 docs/test_cases/t20011_sequence.svg |  72 ++++-----
 docs/test_cases/t20012_sequence.svg | 204 ++++++++++++------------
 docs/test_cases/t20013_sequence.svg |  60 +++----
 docs/test_cases/t20014_sequence.svg |  72 ++++-----
 docs/test_cases/t20015_sequence.svg |  24 +--
 docs/test_cases/t20016_sequence.svg |  48 +++---
 docs/test_cases/t20017_sequence.svg |  48 +++---
 docs/test_cases/t20018_sequence.svg |  96 +++++------
 docs/test_cases/t20019_sequence.svg |  84 +++++-----
 docs/test_cases/t20020_sequence.svg | 118 +++++++-------
 docs/test_cases/t20021_sequence.svg | 106 ++++++-------
 docs/test_cases/t20022_sequence.svg |  36 ++---
 docs/test_cases/t20023_sequence.svg |  50 +++---
 docs/test_cases/t20024_sequence.svg |  88 +++++-----
 docs/test_cases/t20025_sequence.svg |  42 ++---
 docs/test_cases/t20026_sequence.svg |  24 +--
 docs/test_cases/t20027_sequence.svg |  24 +--
 docs/test_cases/t20028_sequence.svg |  44 ++---
 docs/test_cases/t20029_sequence.svg |  80 +++++-----
 docs/test_cases/t30001_package.svg  |  54 +++----
 docs/test_cases/t30002_package.svg  |  90 +++++------
 docs/test_cases/t30003_package.svg  |  26 +--
 docs/test_cases/t30004_package.svg  |  38 ++---
 docs/test_cases/t30005_package.svg  |  38 ++---
 docs/test_cases/t30006_package.svg  |  18 +--
 docs/test_cases/t30007_package.svg  |  22 +--
 docs/test_cases/t30008_package.svg  |  34 ++--
 docs/test_cases/t40001_include.svg  |  34 ++--
 docs/test_cases/t40002_include.svg  |  34 ++--
 docs/test_cases/t40003_include.svg  |  50 +++---
 92 files changed, 2768 insertions(+), 2561 deletions(-)
 create mode 100644 docs/test_cases/t00051.md
 create mode 100644 docs/test_cases/t00051_class.svg

diff --git a/docs/test_cases.md b/docs/test_cases.md
index a92d6d2e..3fcedb99 100644
--- a/docs/test_cases.md
+++ b/docs/test_cases.md
@@ -1,15 +1,4 @@
 # Test cases index
-
-<!-- toc -->
-
-* [Class diagrams](#class-diagrams)
-* [Sequence diagrams](#sequence-diagrams)
-* [Package diagrams](#package-diagrams)
-* [Include diagrams](#include-diagrams)
-* [Configuration diagrams](#configuration-diagrams)
-
-<!-- tocstop -->
-
 ## Class diagrams
  * [t00002](./test_cases/t00002.md) - Basic class inheritance
  * [t00003](./test_cases/t00003.md) - Class field and methods
@@ -60,6 +49,7 @@
  * [t00048](./test_cases/t00048.md) - Test case for unique entity id with multiple translation units
  * [t00049](./test_cases/t00049.md) - Test case configurable type aliases
  * [t00050](./test_cases/t00050.md) - Test case for generating notes from comments using jinja templates
+ * [t00051](./test_cases/t00051.md) - Test case for relative paths in lambda names
 ## Sequence diagrams
  * [t20001](./test_cases/t20001.md) - Basic sequence diagram test case
  * [t20002](./test_cases/t20002.md) - Free function sequence diagram test case
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index be9cd590..780b6acc 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="362px" preserveAspectRatio="none" style="width:562px;height:362px;" version="1.1" viewBox="0 0 562 362" width="562px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fq6sbs5m8f8ki" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f9d4am7myy0o7" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq6sbs5m8f8ki)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
       <ellipse cx="348.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M348.3594,19.3438 L347.2031,24.4219 L349.5313,24.4219 L348.3594,19.3438 Z M346.875,17.1094 L349.8594,17.1094 L353.2188,29.5 L350.7656,29.5 L350,26.4375 L346.7188,26.4375 L345.9688,29.5 L343.5313,29.5 L346.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="28.1543">A</text>
@@ -21,8 +21,8 @@
       <ellipse cx="305" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="75.0151">foo_c() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq6sbs5m8f8ki)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
       <ellipse cx="111.5" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,164.6406 Q113.8906,164.9375 113.25,165.0781 Q112.6094,165.2344 111.9063,165.2344 Q109.4063,165.2344 108.0781,163.5938 Q106.7656,161.9375 106.7656,158.8125 Q106.7656,155.6875 108.0781,154.0313 Q109.4063,152.375 111.9063,152.375 Q112.6094,152.375 113.25,152.5313 Q113.9063,152.6875 114.4688,152.9844 L114.4688,155.7031 Q113.8438,155.125 113.25,154.8594 Q112.6563,154.5781 112.0313,154.5781 Q110.6875,154.5781 110,155.6563 Q109.3125,156.7188 109.3125,158.8125 Q109.3125,160.9063 110,161.9844 Q110.6875,163.0469 112.0313,163.0469 Q112.6563,163.0469 113.25,162.7813 Q113.8438,162.5 114.4688,161.9219 L114.4688,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="163.1543">B</text>
@@ -31,8 +31,8 @@
       <ellipse cx="80.5" cy="194" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="197.2104">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq6sbs5m8f8ki)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
       <ellipse cx="348.55" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.5188,164.6406 Q350.9406,164.9375 350.3,165.0781 Q349.6594,165.2344 348.9563,165.2344 Q346.4563,165.2344 345.1281,163.5938 Q343.8156,161.9375 343.8156,158.8125 Q343.8156,155.6875 345.1281,154.0313 Q346.4563,152.375 348.9563,152.375 Q349.6594,152.375 350.3,152.5313 Q350.9563,152.6875 351.5188,152.9844 L351.5188,155.7031 Q350.8938,155.125 350.3,154.8594 Q349.7063,154.5781 349.0813,154.5781 Q347.7375,154.5781 347.05,155.6563 Q346.3625,156.7188 346.3625,158.8125 Q346.3625,160.9063 347.05,161.9844 Q347.7375,163.0469 349.0813,163.0469 Q349.7063,163.0469 350.3,162.7813 Q350.8938,162.5 351.5188,161.9219 L351.5188,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="163.1543">C</text>
@@ -41,18 +41,18 @@
       <ellipse cx="318" cy="194" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="197.2104">foo_c() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq6sbs5m8f8ki)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
       <ellipse cx="98.75" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.7188,286.6406 Q101.1406,286.9375 100.5,287.0781 Q99.8594,287.2344 99.1563,287.2344 Q96.6563,287.2344 95.3281,285.5938 Q94.0156,283.9375 94.0156,280.8125 Q94.0156,277.6875 95.3281,276.0313 Q96.6563,274.375 99.1563,274.375 Q99.8594,274.375 100.5,274.5313 Q101.1563,274.6875 101.7188,274.9844 L101.7188,277.7031 Q101.0938,277.125 100.5,276.8594 Q99.9063,276.5781 99.2813,276.5781 Q97.9375,276.5781 97.25,277.6563 Q96.5625,278.7188 96.5625,280.8125 Q96.5625,282.9063 97.25,283.9844 Q97.9375,285.0469 99.2813,285.0469 Q99.9063,285.0469 100.5,284.7813 Q101.0938,284.5 101.7188,283.9219 L101.7188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="285.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="303"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="311.2104">as : std::vector&lt;A *&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.8047" y2="317.8047"/>
@@ -60,18 +60,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.0151">foo_a() : void</text>
     <ellipse cx="44.5" cy="341.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.8198">foo_c() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq6sbs5m8f8ki)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
       <ellipse cx="469.25" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.2188,286.6406 Q471.6406,286.9375 471,287.0781 Q470.3594,287.2344 469.6563,287.2344 Q467.1563,287.2344 465.8281,285.5938 Q464.5156,283.9375 464.5156,280.8125 Q464.5156,277.6875 465.8281,276.0313 Q467.1563,274.375 469.6563,274.375 Q470.3594,274.375 471,274.5313 Q471.6563,274.6875 472.2188,274.9844 L472.2188,277.7031 Q471.5938,277.125 471,276.8594 Q470.4063,276.5781 469.7813,276.5781 Q468.4375,276.5781 467.75,277.6563 Q467.0625,278.7188 467.0625,280.8125 Q467.0625,282.9063 467.75,283.9844 Q468.4375,285.0469 469.7813,285.0469 Q470.4063,285.0469 471,284.7813 Q471.5938,284.5 472.2188,283.9219 L472.2188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="285.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="303"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="311.2104">as : std::vector&lt;A *&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.8047" y2="317.8047"/>
@@ -79,13 +79,13 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.0151">foo_a() : void</text>
     <ellipse cx="414.5" cy="341.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.8198">foo_c() : void</text>
-    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#fq6sbs5m8f8ki)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f9d4am7myy0o7)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M249,32.5 L249,42.5 L259,42.5 L249,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="49.5669">This is class A</text>
-    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#fq6sbs5m8f8ki)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f9d4am7myy0o7)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105,32.5 L105,42.5 L115,42.5 L105,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="49.5669">This is class B</text>
-    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#fq6sbs5m8f8ki)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f9d4am7myy0o7)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M358,265 L358,275 L368,275 L358,265 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="282.0669"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="297.1997">This is class D</text>
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index da38737c..5b58d568 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="398px" preserveAspectRatio="none" style="width:347px;height:398px;" version="1.1" viewBox="0 0 347 398" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gxeryi8ypgmf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1fzpr96g8of6w" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1gxeryi8ypgmf)" height="380.9219" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fzpr96g8of6w)" height="380.9219" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
@@ -112,11 +112,11 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="355.7183">protected_method() : void</text>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="362.3125"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="368.5229">private_method() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
       <polygon fill="#FFFF44" points="18,373.1172,22,377.1172,18,381.1172,14,377.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="381.3276">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index 2804440b..549d2675 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fro1v8bvpmpq1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1toeho9mwpp8j" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
       <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
@@ -28,8 +28,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
       <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
@@ -40,16 +40,16 @@
       <ellipse cx="187.5" cy="353.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="357.0151">foo2() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
       <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
       <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
@@ -59,15 +59,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
       <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+    <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
     <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
@@ -75,8 +75,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="480" y="36.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
       <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
@@ -84,39 +84,39 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="590.5" y="299.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="328"/>
       <ellipse cx="501.5" cy="333" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="336.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="340.8047"/>
       <ellipse cx="501.5" cy="345.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="349.0151">b_int : B&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L28" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L28" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
       <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L29" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L29" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L29" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L29" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
       <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L32" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L32" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L32" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L32" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
       <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
@@ -125,8 +125,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L35" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L35" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L35" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L35" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
       <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
@@ -134,16 +134,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="428" y="170.6387">V</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="199.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="201.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="207.7104">b : V</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="214.3047" y2="214.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L41" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L41" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L41" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L41" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
       <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
@@ -152,16 +152,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L45" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L45" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
       <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L47" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L47" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
       <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
@@ -171,8 +171,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L49" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00004/t00004.cc#L49" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fro1v8bvpmpq1)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L49" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L49" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
       <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index 1fbe9653..ac6a4f18 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="384px" preserveAspectRatio="none" style="width:799px;height:384px;" version="1.1" viewBox="0 0 799 384" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1of6qag8txue8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jcgt6wng5cgl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,204 +9,204 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
       <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
       <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
       <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L12" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L12" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L12" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L12" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
       <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
       <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L18" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L18" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L18" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L18" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
       <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L21" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L21" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
       <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L24" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L24" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L24" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L24" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
       <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L27" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L27" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
       <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L30" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L30" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
       <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L33" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L33" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
       <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1of6qag8txue8)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="46"/>
       <ellipse cx="308" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="54.2104">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="58.8047"/>
       <ellipse cx="308" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="67.0151">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="71.6094"/>
       <ellipse cx="308" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="79.8198">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="84.4141"/>
       <ellipse cx="308" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="92.6245">some_int_reference : int &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="97.2188"/>
       <ellipse cx="308" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="105.4292">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="110.0234"/>
       <ellipse cx="308" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="118.2339">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="122.8281"/>
       <ellipse cx="308" cy="127.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="131.0386">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="135.6328"/>
       <ellipse cx="308" cy="140.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="143.8433">d : const D *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="148.4375"/>
       <ellipse cx="308" cy="153.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="156.6479">e : const E &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="161.2422"/>
       <ellipse cx="308" cy="166.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="169.4526">f : F &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="174.0469"/>
       <ellipse cx="308" cy="179.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="182.2573">g : G **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="186.8516"/>
       <ellipse cx="308" cy="191.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="195.062">h : H ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="199.6563"/>
       <ellipse cx="308" cy="204.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="207.8667">i : I *&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="212.4609"/>
       <ellipse cx="308" cy="217.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="220.6714">j : volatile J *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="225.2656"/>
       <ellipse cx="308" cy="230.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="233.4761">k : K *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="240.0703" y2="240.0703"/>
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 95154f2e..3bcff342 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:1390px;height:479px;" version="1.1" viewBox="0 0 1390 479" width="1390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjcjocfur2s9d" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fnsfmyv0i18xl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,136 +9,136 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
       <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
       <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
       <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
       <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
       <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L22" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L22" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L22" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L22" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
       <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
       <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L28" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L28" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L28" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L28" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
       <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L31" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L31" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
       <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L34" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L34" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L34" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L34" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
       <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L37" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L37" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
       <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L40" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L40" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L40" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L40" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
       <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L43" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L43" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L43" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L43" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
       <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L46" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L46" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
       <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L49" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L49" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
       <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L52" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L52" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
       <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L55" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L55" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
       <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
@@ -146,15 +146,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1371.5" y="417.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="446"/>
       <ellipse cx="1232.5" cy="451" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="454.2104">data : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="460.8047" y2="460.8047"/>
-    <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+    <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
     <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
@@ -162,102 +162,102 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="1305" y="308.1387">E</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="331" y2="331"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="339" y2="339"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L60" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjcjocfur2s9d)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L60" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
       <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="46"/>
       <ellipse cx="482" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="54.2104">a : std::vector&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="58.8047"/>
       <ellipse cx="482" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="67.0151">b : std::vector&lt;B *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="71.6094"/>
       <ellipse cx="482" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="79.8198">c : std::map&lt;int,C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="84.4141"/>
       <ellipse cx="482" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="92.6245">d : std::map&lt;int,D *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="97.2188"/>
       <ellipse cx="482" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="105.4292">e : custom_container&lt;E&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="110.0234"/>
       <ellipse cx="482" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="118.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="122.8281"/>
       <ellipse cx="482" cy="127.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="131.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="135.6328"/>
       <ellipse cx="482" cy="140.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="143.8433">h : std::array&lt;H,10&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="148.4375"/>
       <ellipse cx="482" cy="153.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="156.6479">i : std::array&lt;I *,5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="161.2422"/>
       <ellipse cx="482" cy="166.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="169.4526">j : J[10]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="174.0469"/>
       <ellipse cx="482" cy="179.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="182.2573">k : K *[20]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="186.8516"/>
       <ellipse cx="482" cy="191.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="195.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="199.6563"/>
       <ellipse cx="482" cy="204.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="207.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="214.4609" y2="214.4609"/>
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index 893060c5..8d64e3c3 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:207px;height:230px;" version="1.1" viewBox="0 0 207 230" width="207px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2i4fa204n7li" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f639at1hvkmez" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2i4fa204n7li)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2i4fa204n7li)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
       <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2i4fa204n7li)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
       <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L14" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2i4fa204n7li)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L14" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
       <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="46"/>
       <ellipse cx="32.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="54.2104">a : std::unique_ptr&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="58.8047"/>
       <ellipse cx="32.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="67.0151">b : std::shared_ptr&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="71.6094"/>
       <ellipse cx="32.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="79.8198">c : std::weak_ptr&lt;C&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index 3e4cb404..f10a444d 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:616px;height:390px;" version="1.1" viewBox="0 0 616 390" width="616px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ftbir1xt2vf5i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhg4cbxygp0on" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftbir1xt2vf5i)" height="124.8281" id="C_0001329861609426650509" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="124.8281" id="C_0001329861609426650509" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="6" y="8"/>
       <ellipse cx="37.65" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M40.6188,29.6406 Q40.0406,29.9375 39.4,30.0781 Q38.7594,30.2344 38.0563,30.2344 Q35.5563,30.2344 34.2281,28.5938 Q32.9156,26.9375 32.9156,23.8125 Q32.9156,20.6875 34.2281,19.0313 Q35.5563,17.375 38.0563,17.375 Q38.7594,17.375 39.4,17.5313 Q40.0563,17.6875 40.6188,17.9844 L40.6188,20.7031 Q39.9938,20.125 39.4,19.8594 Q38.8063,19.5781 38.1813,19.5781 Q36.8375,19.5781 36.15,20.6563 Q35.4625,21.7188 35.4625,23.8125 Q35.4625,25.9063 36.15,26.9844 Q36.8375,28.0469 38.1813,28.0469 Q38.8063,28.0469 39.4,27.7813 Q39.9938,27.5 40.6188,26.9219 L40.6188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="55.35" y="28.1543">A</text>
@@ -18,51 +18,51 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="89" y="17.1387">T,P,CMP,int N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="67.0151">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="71.6094"/>
       <ellipse cx="17" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="79.8198">reference : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="84.4141"/>
       <ellipse cx="17" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="92.6245">values : std::vector&lt;P&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="97.2188"/>
       <ellipse cx="17" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="105.4292">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="110.0234"/>
       <ellipse cx="17" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="118.2339">comparator : CMP</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="124.8281" y2="124.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftbir1xt2vf5i)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="202" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="202" y="40"/>
       <ellipse cx="252.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M255.2188,61.6406 Q254.6406,61.9375 254,62.0781 Q253.3594,62.2344 252.6563,62.2344 Q250.1563,62.2344 248.8281,60.5938 Q247.5156,58.9375 247.5156,55.8125 Q247.5156,52.6875 248.8281,51.0313 Q250.1563,49.375 252.6563,49.375 Q253.3594,49.375 254,49.5313 Q254.6563,49.6875 255.2188,49.9844 L255.2188,52.7031 Q254.5938,52.125 254,51.8594 Q253.4063,51.5781 252.7813,51.5781 Q251.4375,51.5781 250.75,52.6563 Q250.0625,53.7188 250.0625,55.8125 Q250.0625,57.9063 250.75,58.9844 Q251.4375,60.0469 252.7813,60.0469 Q253.4063,60.0469 254,59.7813 Q254.5938,59.5 255.2188,58.9219 L255.2188,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="272.75" y="60.1543">Vector</text>
@@ -70,16 +70,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="358" y="49.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="72" y2="72"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="208" y="78"/>
       <ellipse cx="213" cy="83" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="222" y="86.2104">values : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="92.8047" y2="92.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftbir1xt2vf5i)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="413" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="413" y="319"/>
       <ellipse cx="471.75" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.7188,340.6406 Q474.1406,340.9375 473.5,341.0781 Q472.8594,341.2344 472.1563,341.2344 Q469.6563,341.2344 468.3281,339.5938 Q467.0156,337.9375 467.0156,334.8125 Q467.0156,331.6875 468.3281,330.0313 Q469.6563,328.375 472.1563,328.375 Q472.8594,328.375 473.5,328.5313 Q474.1563,328.6875 474.7188,328.9844 L474.7188,331.7031 Q474.0938,331.125 473.5,330.8594 Q472.9063,330.5781 472.2813,330.5781 Q470.9375,330.5781 470.25,331.6563 Q469.5625,332.7188 469.5625,334.8125 Q469.5625,336.9063 470.25,337.9844 Q470.9375,339.0469 472.2813,339.0469 Q472.9063,339.0469 473.5,338.7813 Q474.0938,338.5 474.7188,337.9219 L474.7188,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="492.25" y="339.1543">B</text>
@@ -87,15 +87,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="553" y="328.1387">T,C&lt;&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="589" y1="351" y2="351"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="419" y="357"/>
       <ellipse cx="424" cy="362" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="433" y="365.2104">template_template : C&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="589" y1="371.8047" y2="371.8047"/>
-    <rect fill="#FEFECE" filter="url(#ftbir1xt2vf5i)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="449" y="210"/>
+    <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="449" y="210"/>
     <ellipse cx="464" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466.9688,231.6406 Q466.3906,231.9375 465.75,232.0781 Q465.1094,232.2344 464.4063,232.2344 Q461.9063,232.2344 460.5781,230.5938 Q459.2656,228.9375 459.2656,225.8125 Q459.2656,222.6875 460.5781,221.0313 Q461.9063,219.375 464.4063,219.375 Q465.1094,219.375 465.75,219.5313 Q466.4063,219.6875 466.9688,219.9844 L466.9688,222.7031 Q466.3438,222.125 465.75,221.8594 Q465.1563,221.5781 464.5313,221.5781 Q463.1875,221.5781 462.5,222.6563 Q461.8125,223.7188 461.8125,225.8125 Q461.8125,227.9063 462.5,228.9844 Q463.1875,230.0469 464.5313,230.0469 Q465.1563,230.0469 465.75,229.7813 Q466.3438,229.5 466.9688,228.9219 L466.9688,231.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="478" y="230.1543">B</text>
@@ -103,18 +103,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="495" y="219.1387">int,Vector</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="450" x2="553" y1="242" y2="242"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="450" x2="553" y1="250" y2="250"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftbir1xt2vf5i)" height="86.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="398" y="27.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="86.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="398" y="27.5"/>
       <ellipse cx="492.75" cy="43.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M495.7188,49.1406 Q495.1406,49.4375 494.5,49.5781 Q493.8594,49.7344 493.1563,49.7344 Q490.6563,49.7344 489.3281,48.0938 Q488.0156,46.4375 488.0156,43.3125 Q488.0156,40.1875 489.3281,38.5313 Q490.6563,36.875 493.1563,36.875 Q493.8594,36.875 494.5,37.0313 Q495.1563,37.1875 495.7188,37.4844 L495.7188,40.2031 Q495.0938,39.625 494.5,39.3594 Q493.9063,39.0781 493.2813,39.0781 Q491.9375,39.0781 491.25,40.1563 Q490.5625,41.2188 490.5625,43.3125 Q490.5625,45.4063 491.25,46.4844 Q491.9375,47.5469 493.2813,47.5469 Q493.9063,47.5469 494.5,47.2813 Q495.0938,47 495.7188,46.4219 L495.7188,49.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="513.25" y="47.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="604" y1="59.5" y2="59.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="404" y="65.5"/>
       <ellipse cx="409" cy="70.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="418" y="73.7104">ints : B&lt;int,Vector&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="604" y1="80.3047" y2="80.3047"/>
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index e1820597..232951d8 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:448px;height:351px;" version="1.1" viewBox="0 0 448 351" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxumb14yat5y2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wz6k7d94w5ae" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxumb14yat5y2)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
       <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
@@ -18,15 +18,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="186.5" y="289.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="318"/>
       <ellipse cx="127.5" cy="323" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="326.2104">value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="332.8047" y2="332.8047"/>
-    <rect fill="#FEFECE" filter="url(#fxumb14yat5y2)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
+    <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
     <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
@@ -34,7 +34,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="52" y="180.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="211" y2="211"/>
-    <rect fill="#FEFECE" filter="url(#fxumb14yat5y2)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
+    <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
     <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
@@ -42,7 +42,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="147" y="180.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="211" y2="211"/>
-    <rect fill="#FEFECE" filter="url(#fxumb14yat5y2)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
+    <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
     <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
@@ -50,32 +50,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="288" y="180.1387">std::vector&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="211" y2="211"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxumb14yat5y2)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
       <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="46"/>
       <ellipse cx="36.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="54.2104">aint : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="58.8047"/>
       <ellipse cx="36.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="67.0151">astring : A&lt;std::string&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="71.6094"/>
       <ellipse cx="36.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="79.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index f8f577d7..36818cbc 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="586px" preserveAspectRatio="none" style="width:193px;height:586px;" version="1.1" viewBox="0 0 193 586" width="193px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hnh7sqa6i9k2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f81wdnqndqxs5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hnh7sqa6i9k2)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
       <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
@@ -18,22 +18,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="119.5" y="511.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="540"/>
       <ellipse cx="60.5" cy="545" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="548.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="552.8047"/>
       <ellipse cx="60.5" cy="557.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="561.0151">second : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="567.6094" y2="567.6094"/>
-    <rect fill="#FEFECE" filter="url(#f1hnh7sqa6i9k2)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+    <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
     <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
@@ -41,8 +41,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="80" y="402.1387">T,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="425" y2="425"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="433" y2="433"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hnh7sqa6i9k2)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
       <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
@@ -50,15 +50,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="174" y="264.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="301.2104">astring : A&lt;T,std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="307.8047" y2="307.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1hnh7sqa6i9k2)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+    <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
     <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
@@ -66,18 +66,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.5" y="155.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hnh7sqa6i9k2)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
       <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="46"/>
       <ellipse cx="37.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="54.2104">aintstring : B&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index 95e7d50f..afdf308f 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fk4zr1lfg79cy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fnj1npm2emtdl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk4zr1lfg79cy)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1npm2emtdl)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
       <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="76" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk4zr1lfg79cy)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1npm2emtdl)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
       <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
@@ -36,18 +36,18 @@
       <ellipse cx="127" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="62.2104">foo() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L27" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L27" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fk4zr1lfg79cy)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L27" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L27" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fnj1npm2emtdl)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
       <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
       <ellipse cx="127" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="192.2104">m_a : A *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index dfb9a782..705171e8 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1362px;height:390px;" version="1.1" viewBox="0 0 1362 390" width="1362px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1nmdv2bfmc7bz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxlxldl1vcy4w" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
       <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
@@ -18,23 +18,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="972" y="315.1387">T,Ts...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="344"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="352.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="356.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="358.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="365.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
       <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
@@ -43,15 +43,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
       <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
@@ -60,14 +60,14 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
     <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
@@ -75,7 +75,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="804" y="206.1387">int,std::string,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
     <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="113" x="997.5" y="206.1387">int,std::string,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
     <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1190" y="206.1387">3,2,1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
     <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="44" x="1301" y="206.1387">1,1,1,1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
     <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
@@ -107,50 +107,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="450" x="52" y="206.1387">std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1nmdv2bfmc7bz)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
       <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="54.2104">a1 : A&lt;int,std::string,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="67.0151">a2 : A&lt;int,std::string,bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="79.8198">b1 : B&lt;3,2,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="92.6245">b2 : B&lt;1,1,1,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="97.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="99.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="105.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="112.0234" y2="112.0234"/>
-    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f1nmdv2bfmc7bz)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#fxlxldl1vcy4w)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
     <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 66a3fdcb..652b4fd0 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4sqjs7exy0z4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fopdilcal6ir4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
       <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
@@ -18,15 +18,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="247" y="449.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="478.5"/>
       <ellipse cx="172" cy="483.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="486.7104">f : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="493.3047" y2="493.3047"/>
-    <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
     <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
@@ -34,70 +34,70 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="319.5" y="321.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
       <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="343.5"/>
       <ellipse cx="380" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="351.7104">a : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
       <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="343.5"/>
       <ellipse cx="474" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="351.7104">b : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
       <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="343.5"/>
       <ellipse cx="568.5" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="351.7104">c : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
       <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
       <ellipse cx="17" cy="342" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="345.2104">d : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
     <ellipse cx="17" cy="362.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="366.0151">print(R * r) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
       <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
@@ -105,16 +105,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="842.5" y="449.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="478.5"/>
       <ellipse cx="806.5" cy="483.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="486.7104">e : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="493.3047" y2="493.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
       <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
@@ -122,22 +122,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="1076.5" y="443.1387">T,Args...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="472"/>
       <ellipse cx="961.5" cy="477" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="480.2104">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="484.8047"/>
       <ellipse cx="961.5" cy="489.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="493.0151">args : std::tuple&lt;Args...&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="499.6094" y2="499.6094"/>
-    <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
     <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
@@ -145,7 +145,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="837.5" y="321.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
-    <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
     <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
@@ -153,7 +153,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="1005" y="321.1387">int,float,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
-    <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
     <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
@@ -161,25 +161,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="696.5" y="321.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4sqjs7exy0z4)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
       <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
       <ellipse cx="382.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="54.2104">gintstring : G&lt;int,float,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="67.0151">estring : E&lt;std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index ae5eb1e6..d0712cfe 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1078px" preserveAspectRatio="none" style="width:1100px;height:1078px;" version="1.1" viewBox="0 0 1100 1078" width="1100px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hsjjfinwx3jc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcev72m7hajfx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1024" y="561"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1024" y="561"/>
       <ellipse cx="1039" cy="577" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1041.9688,582.6406 Q1041.3906,582.9375 1040.75,583.0781 Q1040.1094,583.2344 1039.4063,583.2344 Q1036.9063,583.2344 1035.5781,581.5938 Q1034.2656,579.9375 1034.2656,576.8125 Q1034.2656,573.6875 1035.5781,572.0313 Q1036.9063,570.375 1039.4063,570.375 Q1040.1094,570.375 1040.75,570.5313 Q1041.4063,570.6875 1041.9688,570.9844 L1041.9688,573.7031 Q1041.3438,573.125 1040.75,572.8594 Q1040.1563,572.5781 1039.5313,572.5781 Q1038.1875,572.5781 1037.5,573.6563 Q1036.8125,574.7188 1036.8125,576.8125 Q1036.8125,578.9063 1037.5,579.9844 Q1038.1875,581.0469 1039.5313,581.0469 Q1040.1563,581.0469 1040.75,580.7813 Q1041.3438,580.5 1041.9688,579.9219 L1041.9688,582.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1053" y="581.1543">A</text>
@@ -18,37 +18,37 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="1070" y="570.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1085" y1="593" y2="593"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1030" y="599"/>
       <ellipse cx="1035" cy="604" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1044" y="607.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1030" y="611.8047"/>
       <ellipse cx="1035" cy="616.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1044" y="620.0151">p : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1085" y1="626.6094" y2="626.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="481.5" y="65.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="481.5" y="65.5"/>
       <ellipse cx="536.75" cy="81.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M539.7188,87.1406 Q539.1406,87.4375 538.5,87.5781 Q537.8594,87.7344 537.1563,87.7344 Q534.6563,87.7344 533.3281,86.0938 Q532.0156,84.4375 532.0156,81.3125 Q532.0156,78.1875 533.3281,76.5313 Q534.6563,74.875 537.1563,74.875 Q537.8594,74.875 538.5,75.0313 Q539.1563,75.1875 539.7188,75.4844 L539.7188,78.2031 Q539.0938,77.625 538.5,77.3594 Q537.9063,77.0781 537.2813,77.0781 Q535.9375,77.0781 535.25,78.1563 Q534.5625,79.2188 534.5625,81.3125 Q534.5625,83.4063 535.25,84.4844 Q535.9375,85.5469 537.2813,85.5469 Q537.9063,85.5469 538.5,85.2813 Q539.0938,85 539.7188,84.4219 L539.7188,87.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557.25" y="85.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="607.5" y1="97.5" y2="97.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="487.5" y="103.5"/>
       <ellipse cx="492.5" cy="108.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="501.5" y="111.7104">value : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="607.5" y1="118.3047" y2="118.3047"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="789" y="832"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="789" y="832"/>
     <ellipse cx="804" cy="848" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M806.9688,853.6406 Q806.3906,853.9375 805.75,854.0781 Q805.1094,854.2344 804.4063,854.2344 Q801.9063,854.2344 800.5781,852.5938 Q799.2656,850.9375 799.2656,847.8125 Q799.2656,844.6875 800.5781,843.0313 Q801.9063,841.375 804.4063,841.375 Q805.1094,841.375 805.75,841.5313 Q806.4063,841.6875 806.9688,841.9844 L806.9688,844.7031 Q806.3438,844.125 805.75,843.8594 Q805.1563,843.5781 804.5313,843.5781 Q803.1875,843.5781 802.5,844.6563 Q801.8125,845.7188 801.8125,847.8125 Q801.8125,849.9063 802.5,850.9844 Q803.1875,852.0469 804.5313,852.0469 Q805.1563,852.0469 805.75,851.7813 Q806.3438,851.5 806.9688,850.9219 L806.9688,853.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="818" y="852.1543">A</text>
@@ -56,7 +56,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="835" y="841.1387">T,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="790" x2="905" y1="864" y2="864"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="790" x2="905" y1="872" y2="872"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="732" y="604"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="732" y="604"/>
     <ellipse cx="747" cy="620" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M749.9688,625.6406 Q749.3906,625.9375 748.75,626.0781 Q748.1094,626.2344 747.4063,626.2344 Q744.9063,626.2344 743.5781,624.5938 Q742.2656,622.9375 742.2656,619.8125 Q742.2656,616.6875 743.5781,615.0313 Q744.9063,613.375 747.4063,613.375 Q748.1094,613.375 748.75,613.5313 Q749.4063,613.6875 749.9688,613.9844 L749.9688,616.7031 Q749.3438,616.125 748.75,615.8594 Q748.1563,615.5781 747.5313,615.5781 Q746.1875,615.5781 745.5,616.6563 Q744.8125,617.7188 744.8125,619.8125 Q744.8125,621.9063 745.5,622.9844 Q746.1875,624.0469 747.5313,624.0469 Q748.1563,624.0469 748.75,623.7813 Q749.3438,623.5 749.9688,622.9219 L749.9688,625.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="761" y="624.1543">A</text>
@@ -64,7 +64,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="778" y="613.1387">T,std::unique_ptr&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="733" x2="962" y1="636" y2="636"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="733" x2="962" y1="644" y2="644"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="806.5" y="303"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="806.5" y="303"/>
     <ellipse cx="821.5" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M824.4688,324.6406 Q823.8906,324.9375 823.25,325.0781 Q822.6094,325.2344 821.9063,325.2344 Q819.4063,325.2344 818.0781,323.5938 Q816.7656,321.9375 816.7656,318.8125 Q816.7656,315.6875 818.0781,314.0313 Q819.4063,312.375 821.9063,312.375 Q822.6094,312.375 823.25,312.5313 Q823.9063,312.6875 824.4688,312.9844 L824.4688,315.7031 Q823.8438,315.125 823.25,314.8594 Q822.6563,314.5781 822.0313,314.5781 Q820.6875,314.5781 820,315.6563 Q819.3125,316.7188 819.3125,318.8125 Q819.3125,320.9063 820,321.9844 Q820.6875,323.0469 822.0313,323.0469 Q822.6563,323.0469 823.25,322.7813 Q823.8438,322.5 824.4688,321.9219 L824.4688,324.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.5" y="323.1543">A</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="852.5" y="312.1387">long,T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="807.5" x2="887.5" y1="335" y2="335"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="807.5" x2="887.5" y1="343" y2="343"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="798.5" y="521"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="798.5" y="521"/>
     <ellipse cx="813.5" cy="537" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M816.4688,542.6406 Q815.8906,542.9375 815.25,543.0781 Q814.6094,543.2344 813.9063,543.2344 Q811.4063,543.2344 810.0781,541.5938 Q808.7656,539.9375 808.7656,536.8125 Q808.7656,533.6875 810.0781,532.0313 Q811.4063,530.375 813.9063,530.375 Q814.6094,530.375 815.25,530.5313 Q815.9063,530.6875 816.4688,530.9844 L816.4688,533.7031 Q815.8438,533.125 815.25,532.8594 Q814.6563,532.5781 814.0313,532.5781 Q812.6875,532.5781 812,533.6563 Q811.3125,534.7188 811.3125,536.8125 Q811.3125,538.9063 812,539.9844 Q812.6875,541.0469 814.0313,541.0469 Q814.6563,541.0469 815.25,540.7813 Q815.8438,540.5 816.4688,539.9219 L816.4688,542.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827.5" y="541.1543">A</text>
@@ -80,7 +80,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="844.5" y="530.1387">double,T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="799.5" x2="895.5" y1="553" y2="553"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="799.5" x2="895.5" y1="561" y2="561"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="503" y="272"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="503" y="272"/>
     <ellipse cx="518" cy="288" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M520.9688,293.6406 Q520.3906,293.9375 519.75,294.0781 Q519.1094,294.2344 518.4063,294.2344 Q515.9063,294.2344 514.5781,292.5938 Q513.2656,290.9375 513.2656,287.8125 Q513.2656,284.6875 514.5781,283.0313 Q515.9063,281.375 518.4063,281.375 Q519.1094,281.375 519.75,281.5313 Q520.4063,281.6875 520.9688,281.9844 L520.9688,284.7031 Q520.3438,284.125 519.75,283.8594 Q519.1563,283.5781 518.5313,283.5781 Q517.1875,283.5781 516.5,284.6563 Q515.8125,285.7188 515.8125,287.8125 Q515.8125,289.9063 516.5,290.9844 Q517.1875,292.0469 518.5313,292.0469 Q519.1563,292.0469 519.75,291.7813 Q520.3438,291.5 520.9688,290.9219 L520.9688,293.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="532" y="292.1543">A</text>
@@ -88,7 +88,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="549" y="281.1387">long,U</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="504" x2="586" y1="304" y2="304"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="504" x2="586" y1="312" y2="312"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="494" y="355"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="494" y="355"/>
     <ellipse cx="509" cy="371" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M511.9688,376.6406 Q511.3906,376.9375 510.75,377.0781 Q510.1094,377.2344 509.4063,377.2344 Q506.9063,377.2344 505.5781,375.5938 Q504.2656,373.9375 504.2656,370.8125 Q504.2656,367.6875 505.5781,366.0313 Q506.9063,364.375 509.4063,364.375 Q510.1094,364.375 510.75,364.5313 Q511.4063,364.6875 511.9688,364.9844 L511.9688,367.7031 Q511.3438,367.125 510.75,366.8594 Q510.1563,366.5781 509.5313,366.5781 Q508.1875,366.5781 507.5,367.6563 Q506.8125,368.7188 506.8125,370.8125 Q506.8125,372.9063 507.5,373.9844 Q508.1875,375.0469 509.5313,375.0469 Q510.1563,375.0469 510.75,374.7813 Q511.3438,374.5 511.9688,373.9219 L511.9688,376.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="523" y="375.1543">A</text>
@@ -96,7 +96,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="540" y="364.1387">long,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="495" x2="595" y1="387" y2="387"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="495" x2="595" y1="395" y2="395"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="486" y="521"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="486" y="521"/>
     <ellipse cx="501" cy="537" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M503.9688,542.6406 Q503.3906,542.9375 502.75,543.0781 Q502.1094,543.2344 501.4063,543.2344 Q498.9063,543.2344 497.5781,541.5938 Q496.2656,539.9375 496.2656,536.8125 Q496.2656,533.6875 497.5781,532.0313 Q498.9063,530.375 501.4063,530.375 Q502.1094,530.375 502.75,530.5313 Q503.4063,530.6875 503.9688,530.9844 L503.9688,533.7031 Q503.3438,533.125 502.75,532.8594 Q502.1563,532.5781 501.5313,532.5781 Q500.1875,532.5781 499.5,533.6563 Q498.8125,534.7188 498.8125,536.8125 Q498.8125,538.9063 499.5,539.9844 Q500.1875,541.0469 501.5313,541.0469 Q502.1563,541.0469 502.75,540.7813 Q503.3438,540.5 503.9688,539.9219 L503.9688,542.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515" y="541.1543">A</text>
@@ -104,7 +104,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="532" y="530.1387">double,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="487" x2="603" y1="553" y2="553"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="487" x2="603" y1="561" y2="561"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="493.5" y="189"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="493.5" y="189"/>
     <ellipse cx="508.5" cy="205" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M511.4688,210.6406 Q510.8906,210.9375 510.25,211.0781 Q509.6094,211.2344 508.9063,211.2344 Q506.4063,211.2344 505.0781,209.5938 Q503.7656,207.9375 503.7656,204.8125 Q503.7656,201.6875 505.0781,200.0313 Q506.4063,198.375 508.9063,198.375 Q509.6094,198.375 510.25,198.5313 Q510.9063,198.6875 511.4688,198.9844 L511.4688,201.7031 Q510.8438,201.125 510.25,200.8594 Q509.6563,200.5781 509.0313,200.5781 Q507.6875,200.5781 507,201.6563 Q506.3125,202.7188 506.3125,204.8125 Q506.3125,206.9063 507,207.9844 Q507.6875,209.0469 509.0313,209.0469 Q509.6563,209.0469 510.25,208.7813 Q510.8438,208.5 511.4688,207.9219 L511.4688,210.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="522.5" y="209.1543">A</text>
@@ -112,7 +112,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="539.5" y="198.1387">long,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="595.5" y1="221" y2="221"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="595.5" y1="229" y2="229"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="485.5" y="438"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="485.5" y="438"/>
     <ellipse cx="500.5" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M503.4688,459.6406 Q502.8906,459.9375 502.25,460.0781 Q501.6094,460.2344 500.9063,460.2344 Q498.4063,460.2344 497.0781,458.5938 Q495.7656,456.9375 495.7656,453.8125 Q495.7656,450.6875 497.0781,449.0313 Q498.4063,447.375 500.9063,447.375 Q501.6094,447.375 502.25,447.5313 Q502.9063,447.6875 503.4688,447.9844 L503.4688,450.7031 Q502.8438,450.125 502.25,449.8594 Q501.6563,449.5781 501.0313,449.5781 Q499.6875,449.5781 499,450.6563 Q498.3125,451.7188 498.3125,453.8125 Q498.3125,455.9063 499,456.9844 Q499.6875,458.0469 501.0313,458.0469 Q501.6563,458.0469 502.25,457.7813 Q502.8438,457.5 503.4688,456.9219 L503.4688,459.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="514.5" y="458.1543">A</text>
@@ -120,7 +120,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="531.5" y="447.1387">double,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="603.5" y1="470" y2="470"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="603.5" y1="478" y2="478"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="476.5" y="1019"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="476.5" y="1019"/>
     <ellipse cx="491.5" cy="1035" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M494.4688,1040.6406 Q493.8906,1040.9375 493.25,1041.0781 Q492.6094,1041.2344 491.9063,1041.2344 Q489.4063,1041.2344 488.0781,1039.5938 Q486.7656,1037.9375 486.7656,1034.8125 Q486.7656,1031.6875 488.0781,1030.0313 Q489.4063,1028.375 491.9063,1028.375 Q492.6094,1028.375 493.25,1028.5313 Q493.9063,1028.6875 494.4688,1028.9844 L494.4688,1031.7031 Q493.8438,1031.125 493.25,1030.8594 Q492.6563,1030.5781 492.0313,1030.5781 Q490.6875,1030.5781 490,1031.6563 Q489.3125,1032.7188 489.3125,1034.8125 Q489.3125,1036.9063 490,1037.9844 Q490.6875,1039.0469 492.0313,1039.0469 Q492.6563,1039.0469 493.25,1038.7813 Q493.8438,1038.5 494.4688,1037.9219 L494.4688,1040.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="505.5" y="1039.1543">A</text>
@@ -128,7 +128,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="522.5" y="1028.1387">bool,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477.5" x2="612.5" y1="1051" y2="1051"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477.5" x2="612.5" y1="1059" y2="1059"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="419" y="604"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="419" y="604"/>
     <ellipse cx="434" cy="620" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M436.9688,625.6406 Q436.3906,625.9375 435.75,626.0781 Q435.1094,626.2344 434.4063,626.2344 Q431.9063,626.2344 430.5781,624.5938 Q429.2656,622.9375 429.2656,619.8125 Q429.2656,616.6875 430.5781,615.0313 Q431.9063,613.375 434.4063,613.375 Q435.1094,613.375 435.75,613.5313 Q436.4063,613.6875 436.9688,613.9844 L436.9688,616.7031 Q436.3438,616.125 435.75,615.8594 Q435.1563,615.5781 434.5313,615.5781 Q433.1875,615.5781 432.5,616.6563 Q431.8125,617.7188 431.8125,619.8125 Q431.8125,621.9063 432.5,622.9844 Q433.1875,624.0469 434.5313,624.0469 Q435.1563,624.0469 435.75,623.7813 Q436.3438,623.5 436.9688,622.9219 L436.9688,625.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="448" y="624.1543">A</text>
@@ -136,7 +136,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="208" x="465" y="613.1387">float,std::unique_ptr&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="670" y1="636" y2="636"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="670" y1="644" y2="644"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="482" y="770"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="482" y="770"/>
     <ellipse cx="497" cy="786" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M499.9688,791.6406 Q499.3906,791.9375 498.75,792.0781 Q498.1094,792.2344 497.4063,792.2344 Q494.9063,792.2344 493.5781,790.5938 Q492.2656,788.9375 492.2656,785.8125 Q492.2656,782.6875 493.5781,781.0313 Q494.9063,779.375 497.4063,779.375 Q498.1094,779.375 498.75,779.5313 Q499.4063,779.6875 499.9688,779.9844 L499.9688,782.7031 Q499.3438,782.125 498.75,781.8594 Q498.1563,781.5781 497.5313,781.5781 Q496.1875,781.5781 495.5,782.6563 Q494.8125,783.7188 494.8125,785.8125 Q494.8125,787.9063 495.5,788.9844 Q496.1875,790.0469 497.5313,790.0469 Q498.1563,790.0469 498.75,789.7813 Q499.3438,789.5 499.9688,788.9219 L499.9688,791.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="511" y="790.1543">A</text>
@@ -144,7 +144,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="528" y="779.1387">int,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="483" x2="607" y1="802" y2="802"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="483" x2="607" y1="810" y2="810"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="459" y="853"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="459" y="853"/>
     <ellipse cx="474" cy="869" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M476.9688,874.6406 Q476.3906,874.9375 475.75,875.0781 Q475.1094,875.2344 474.4063,875.2344 Q471.9063,875.2344 470.5781,873.5938 Q469.2656,871.9375 469.2656,868.8125 Q469.2656,865.6875 470.5781,864.0313 Q471.9063,862.375 474.4063,862.375 Q475.1094,862.375 475.75,862.5313 Q476.4063,862.6875 476.9688,862.9844 L476.9688,865.7031 Q476.3438,865.125 475.75,864.8594 Q475.1563,864.5781 474.5313,864.5781 Q473.1875,864.5781 472.5,865.6563 Q471.8125,866.7188 471.8125,868.8125 Q471.8125,870.9063 472.5,871.9844 Q473.1875,873.0469 474.5313,873.0469 Q475.1563,873.0469 475.75,872.7813 Q476.3438,872.5 476.9688,871.9219 L476.9688,874.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="488" y="873.1543">A</text>
@@ -152,7 +152,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="128" x="505" y="862.1387">std::string,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="460" x2="630" y1="885" y2="885"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="460" x2="630" y1="893" y2="893"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000640294848487970524" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="476" y="936"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000640294848487970524" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="476" y="936"/>
     <ellipse cx="491" cy="952" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M493.9688,957.6406 Q493.3906,957.9375 492.75,958.0781 Q492.1094,958.2344 491.4063,958.2344 Q488.9063,958.2344 487.5781,956.5938 Q486.2656,954.9375 486.2656,951.8125 Q486.2656,948.6875 487.5781,947.0313 Q488.9063,945.375 491.4063,945.375 Q492.1094,945.375 492.75,945.5313 Q493.4063,945.6875 493.9688,945.9844 L493.9688,948.7031 Q493.3438,948.125 492.75,947.8594 Q492.1563,947.5781 491.5313,947.5781 Q490.1875,947.5781 489.5,948.6563 Q488.8125,949.7188 488.8125,951.8125 Q488.8125,953.9063 489.5,954.9844 Q490.1875,956.0469 491.5313,956.0469 Q492.1563,956.0469 492.75,955.7813 Q493.3438,955.5 493.9688,954.9219 L493.9688,957.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="505" y="956.1543">A</text>
@@ -160,7 +160,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="522" y="945.1387">char,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="613" y1="968" y2="968"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="613" y1="976" y2="976"/>
-    <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="48" id="C_0000139599686497663147" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="465.5" y="687"/>
+    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000139599686497663147" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="465.5" y="687"/>
     <ellipse cx="480.5" cy="703" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M483.4688,708.6406 Q482.8906,708.9375 482.25,709.0781 Q481.6094,709.2344 480.9063,709.2344 Q478.4063,709.2344 477.0781,707.5938 Q475.7656,705.9375 475.7656,702.8125 Q475.7656,699.6875 477.0781,698.0313 Q478.4063,696.375 480.9063,696.375 Q481.6094,696.375 482.25,696.5313 Q482.9063,696.6875 483.4688,696.9844 L483.4688,699.7031 Q482.8438,699.125 482.25,698.8594 Q481.6563,698.5781 481.0313,698.5781 Q479.6875,698.5781 479,699.6563 Q478.3125,700.7188 478.3125,702.8125 Q478.3125,704.9063 479,705.9844 Q479.6875,707.0469 481.0313,707.0469 Q481.6563,707.0469 482.25,706.7813 Q482.8438,706.5 483.4688,705.9219 L483.4688,708.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494.5" y="707.1543">A</text>
@@ -168,116 +168,116 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="511.5" y="696.1387">wchar_t,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="466.5" x2="623.5" y1="719" y2="719"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="466.5" x2="623.5" y1="727" y2="727"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hsjjfinwx3jc)" height="240.0703" id="C_0001192822659863756768" style="stroke: #A80036; stroke-width: 1.5;" width="259" x="6" y="379"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="240.0703" id="C_0001192822659863756768" style="stroke: #A80036; stroke-width: 1.5;" width="259" x="6" y="379"/>
       <ellipse cx="127.25" cy="395" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M130.2188,400.6406 Q129.6406,400.9375 129,401.0781 Q128.3594,401.2344 127.6563,401.2344 Q125.1563,401.2344 123.8281,399.5938 Q122.5156,397.9375 122.5156,394.8125 Q122.5156,391.6875 123.8281,390.0313 Q125.1563,388.375 127.6563,388.375 Q128.3594,388.375 129,388.5313 Q129.6563,388.6875 130.2188,388.9844 L130.2188,391.7031 Q129.5938,391.125 129,390.8594 Q128.4063,390.5781 127.7813,390.5781 Q126.4375,390.5781 125.75,391.6563 Q125.0625,392.7188 125.0625,394.8125 Q125.0625,396.9063 125.75,397.9844 Q126.4375,399.0469 127.7813,399.0469 Q128.4063,399.0469 129,398.7813 Q129.5938,398.5 130.2188,397.9219 L130.2188,400.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="147.75" y="399.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="264" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="417"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="419"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="425.2104">bapair : PairPairBA&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="429.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="431.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="438.0151">abool : APtr&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="442.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="444.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="450.8198">aboolfloat : AAPtr&lt;bool,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="455.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="457.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="463.6245">afloat : ASharedPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="468.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="470.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="476.4292">boolstring : A&lt;bool,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="481.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="483.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="489.2339">floatstring : AStringPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="493.8281"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="495.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="502.0386">intstring : AIntString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="506.6328"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="508.6328"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="514.8433">stringstring : AStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="519.4375"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="521.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="527.6479">bstringstring : BStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="532.2422"/>
       <polygon fill="none" points="17,532.2422,21,536.2422,17,540.2422,13,536.2422" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="540.4526">bs : BVector</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="545.0469"/>
       <ellipse cx="17" cy="550.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="553.2573">bs2 : BVector2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="557.8516"/>
       <ellipse cx="17" cy="562.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="566.062">cb : SimpleCallback&lt;ACharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="570.6563"/>
       <ellipse cx="17" cy="575.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="233" x="26" y="578.8667">gcb : GenericCallback&lt;R::AWCharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="583.4609"/>
       <ellipse cx="17" cy="588.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="591.6714">vcb : VoidCallback</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="596.2656"/>
       <ellipse cx="17" cy="601.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="604.4761">vps : VectorPtr&lt;B&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="264" y1="611.0703" y2="611.0703"/>
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index 87ce913d..dbae78aa 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:365px;height:283px;" version="1.1" viewBox="0 0 365 283" width="365px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f12kq4coiqdubs" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19qtfgnbcv425" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kq4coiqdubs)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
       <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kq4coiqdubs)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
       <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L16" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L16" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kq4coiqdubs)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L16" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L16" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="35" y="136.1543">ns1::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L24" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kq4coiqdubs)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L24" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
       <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00015/t00015.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kq4coiqdubs)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
       <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index 6b29d7b6..d83ad125 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:980px;height:200px;" version="1.1" viewBox="0 0 980 200" width="980px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1parwpgiep05b" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fszynl8qaye3q" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0000214045147845616983" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="367" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000214045147845616983" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="367" y="129"/>
       <ellipse cx="382" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M384.9688,150.6406 Q384.3906,150.9375 383.75,151.0781 Q383.1094,151.2344 382.4063,151.2344 Q379.9063,151.2344 378.5781,149.5938 Q377.2656,147.9375 377.2656,144.8125 Q377.2656,141.6875 378.5781,140.0313 Q379.9063,138.375 382.4063,138.375 Q383.1094,138.375 383.75,138.5313 Q384.4063,138.6875 384.9688,138.9844 L384.9688,141.7031 Q384.3438,141.125 383.75,140.8594 Q383.1563,140.5781 382.5313,140.5781 Q381.1875,140.5781 380.5,141.6563 Q379.8125,142.7188 379.8125,144.8125 Q379.8125,146.9063 380.5,147.9844 Q381.1875,149.0469 382.5313,149.0469 Q383.1563,149.0469 383.75,148.7813 Q384.3438,148.5 384.9688,147.9219 L384.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="396" y="149.1543">is_numeric&lt;&gt;</text>
@@ -19,8 +19,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="387" y="175.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368" x2="484" y1="181.8047" y2="181.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0000722777951198284620" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="869" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000722777951198284620" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="869" y="8"/>
       <ellipse cx="884.9" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M887.8688,29.6406 Q887.2906,29.9375 886.65,30.0781 Q886.0094,30.2344 885.3063,30.2344 Q882.8063,30.2344 881.4781,28.5938 Q880.1656,26.9375 880.1656,23.8125 Q880.1656,20.6875 881.4781,19.0313 Q882.8063,17.375 885.3063,17.375 Q886.0094,17.375 886.65,17.5313 Q887.3063,17.6875 887.8688,17.9844 L887.8688,20.7031 Q887.2438,20.125 886.65,19.8594 Q886.0563,19.5781 885.4313,19.5781 Q884.0875,19.5781 883.4,20.6563 Q882.7125,21.7188 882.7125,23.8125 Q882.7125,25.9063 883.4,26.9844 Q884.0875,28.0469 885.4313,28.0469 Q886.0563,28.0469 886.65,27.7813 Q887.2438,27.5 887.8688,26.9219 L887.8688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="899.1" y="28.1543">is_numeric</text>
@@ -29,8 +29,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="889" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="870" x2="968" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
@@ -41,8 +41,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="26" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
       <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
@@ -53,8 +53,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="191" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
       <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
@@ -65,8 +65,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="356.5" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
       <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
@@ -77,8 +77,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="571" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1parwpgiep05b)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
       <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 0ed88f0f..b6dcb910 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:799px;height:256px;" version="1.1" viewBox="0 0 799 256" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkwknwncjqm1q" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxhe9tg31vu7k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,127 +9,127 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
       <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
       <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
       <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
       <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L20" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L20" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L20" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L20" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
       <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L23" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L23" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
       <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L26" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L26" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L26" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L26" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
       <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L29" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L29" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L29" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L29" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
       <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L32" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L32" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L32" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L32" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
       <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L35" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L35" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L35" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L35" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
       <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkwknwncjqm1q)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="196.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="196.5" y="8"/>
       <ellipse cx="377.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M380.7188,29.6406 Q380.1406,29.9375 379.5,30.0781 Q378.8594,30.2344 378.1563,30.2344 Q375.6563,30.2344 374.3281,28.5938 Q373.0156,26.9375 373.0156,23.8125 Q373.0156,20.6875 374.3281,19.0313 Q375.6563,17.375 378.1563,17.375 Q378.8594,17.375 379.5,17.5313 Q380.1563,17.6875 380.7188,17.9844 L380.7188,20.7031 Q380.0938,20.125 379.5,19.8594 Q378.9063,19.5781 378.2813,19.5781 Q376.9375,19.5781 376.25,20.6563 Q375.5625,21.7188 375.5625,23.8125 Q375.5625,25.9063 376.25,26.9844 Q376.9375,28.0469 378.2813,28.0469 Q378.9063,28.0469 379.5,27.7813 Q380.0938,27.5 380.7188,26.9219 L380.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="398.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="197.5" x2="574.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="216.5" y="54.2104">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="216.5" y="67.0151">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="216.5" y="79.8198">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="216.5" y="92.6245">some_int_reference : int &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="197.5" x2="574.5" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index f060ee19..832d1cad 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="371px" preserveAspectRatio="none" style="width:262px;height:371px;" version="1.1" viewBox="0 0 262 371" width="262px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkw3snpqh3tan" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1tokw2976wmaj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,18 +9,18 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkw3snpqh3tan)" height="99.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tokw2976wmaj)" height="99.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="13" y="8"/>
       <ellipse cx="87.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M90.2188,29.6406 Q89.6406,29.9375 89,30.0781 Q88.3594,30.2344 87.6563,30.2344 Q85.1563,30.2344 83.8281,28.5938 Q82.5156,26.9375 82.5156,23.8125 Q82.5156,20.6875 83.8281,19.0313 Q85.1563,17.375 87.6563,17.375 Q88.3594,17.375 89,17.5313 Q89.6563,17.6875 90.2188,17.9844 L90.2188,20.7031 Q89.5938,20.125 89,19.8594 Q88.4063,19.5781 87.7813,19.5781 Q86.4375,19.5781 85.75,20.6563 Q85.0625,21.7188 85.0625,23.8125 Q85.0625,25.9063 85.75,26.9844 Q86.4375,28.0469 87.7813,28.0469 Q88.4063,28.0469 89,27.7813 Q89.5938,27.5 90.2188,26.9219 L90.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="107.75" y="28.1543">impl::widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="243" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="21" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="33" y="54.2104">n : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="243" y1="60.8047" y2="60.8047"/>
@@ -30,18 +30,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="33" y="87.8198">draw(const widget &amp; w) : void</text>
     <ellipse cx="24" cy="97.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="33" y="100.6245">widget(int n) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkw3snpqh3tan)" height="176.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tokw2976wmaj)" height="176.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="184"/>
       <ellipse cx="103.75" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M106.7188,205.6406 Q106.1406,205.9375 105.5,206.0781 Q104.8594,206.2344 104.1563,206.2344 Q101.6563,206.2344 100.3281,204.5938 Q99.0156,202.9375 99.0156,199.8125 Q99.0156,196.6875 100.3281,195.0313 Q101.6563,193.375 104.1563,193.375 Q104.8594,193.375 105.5,193.5313 Q106.1563,193.6875 106.7188,193.9844 L106.7188,196.7031 Q106.0938,196.125 105.5,195.8594 Q104.9063,195.5781 104.2813,195.5781 Q102.9375,195.5781 102.25,196.6563 Q101.5625,197.7188 101.5625,199.8125 Q101.5625,201.9063 102.25,202.9844 Q102.9375,204.0469 104.2813,204.0469 Q104.9063,204.0469 105.5,203.7813 Q106.0938,203.5 106.7188,202.9219 L106.7188,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="124.25" y="204.1543">widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="222"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="230.2104">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="236.8047" y2="236.8047"/>
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index c8886a7c..4ee8a52d 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="685px" preserveAspectRatio="none" style="width:781px;height:685px;" version="1.1" viewBox="0 0 781 685" width="781px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmeek7bybmlwr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f75rs0ovcv4b9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="99.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="163" x="194.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="99.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="163" x="194.5" y="8"/>
       <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="276.75" y="28.1543">Base</text>
@@ -25,8 +25,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="202.5" y="94.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="214.5" y="100.6245">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="443" y="601"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="443" y="601"/>
       <ellipse cx="458" cy="617" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M460.9688,622.6406 Q460.3906,622.9375 459.75,623.0781 Q459.1094,623.2344 458.4063,623.2344 Q455.9063,623.2344 454.5781,621.5938 Q453.2656,619.9375 453.2656,616.8125 Q453.2656,613.6875 454.5781,612.0313 Q455.9063,610.375 458.4063,610.375 Q459.1094,610.375 459.75,610.5313 Q460.4063,610.6875 460.9688,610.9844 L460.9688,613.7031 Q460.3438,613.125 459.75,612.8594 Q459.1563,612.5781 458.5313,612.5781 Q457.1875,612.5781 456.5,613.6563 Q455.8125,614.7188 455.8125,616.8125 Q455.8125,618.9063 456.5,619.9844 Q457.1875,621.0469 458.5313,621.0469 Q459.1563,621.0469 459.75,620.7813 Q460.3438,620.5 460.9688,619.9219 L460.9688,622.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="472" y="621.1543">Layer1</text>
@@ -39,8 +39,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="451" y="661.8047"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="463" y="668.0151">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="187.5" y="479"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="187.5" y="479"/>
       <ellipse cx="214.65" cy="495" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M217.6188,500.6406 Q217.0406,500.9375 216.4,501.0781 Q215.7594,501.2344 215.0563,501.2344 Q212.5563,501.2344 211.2281,499.5938 Q209.9156,497.9375 209.9156,494.8125 Q209.9156,491.6875 211.2281,490.0313 Q212.5563,488.375 215.0563,488.375 Q215.7594,488.375 216.4,488.5313 Q217.0563,488.6875 217.6188,488.9844 L217.6188,491.7031 Q216.9938,491.125 216.4,490.8594 Q215.8063,490.5781 215.1813,490.5781 Q213.8375,490.5781 213.15,491.6563 Q212.4625,492.7188 212.4625,494.8125 Q212.4625,496.9063 213.15,497.9844 Q213.8375,499.0469 215.1813,499.0469 Q215.8063,499.0469 216.4,498.7813 Q216.9938,498.5 217.6188,497.9219 L217.6188,500.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="231.35" y="499.1543">Layer2</text>
@@ -51,8 +51,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="195.5" y="527"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="207.5" y="533.2104">all_calls_count() const : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="277"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="277"/>
       <ellipse cx="21" cy="293" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,298.6406 Q23.3906,298.9375 22.75,299.0781 Q22.1094,299.2344 21.4063,299.2344 Q18.9063,299.2344 17.5781,297.5938 Q16.2656,295.9375 16.2656,292.8125 Q16.2656,289.6875 17.5781,288.0313 Q18.9063,286.375 21.4063,286.375 Q22.1094,286.375 22.75,286.5313 Q23.4063,286.6875 23.9688,286.9844 L23.9688,289.7031 Q23.3438,289.125 22.75,288.8594 Q22.1563,288.5781 21.5313,288.5781 Q20.1875,288.5781 19.5,289.6563 Q18.8125,290.7188 18.8125,292.8125 Q18.8125,294.9063 19.5,295.9844 Q20.1875,297.0469 21.5313,297.0469 Q22.1563,297.0469 22.75,296.7813 Q23.3438,296.5 23.9688,295.9219 L23.9688,298.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="35" y="297.1543">Layer3</text>
@@ -60,18 +60,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="85" y="286.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="309" y2="309"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="315"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="317"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="323.2104">m_m1_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="327.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="329.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="336.0151">m_m2_calls : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="342.6094" y2="342.6094"/>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="26" y="382.4292">m1_calls() const : int</text>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="389.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="26" y="395.2339">m2_calls() const : int</text>
-    <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="222.5" y="168"/>
+    <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="222.5" y="168"/>
     <ellipse cx="237.5" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M240.4688,189.6406 Q239.8906,189.9375 239.25,190.0781 Q238.6094,190.2344 237.9063,190.2344 Q235.4063,190.2344 234.0781,188.5938 Q232.7656,186.9375 232.7656,183.8125 Q232.7656,180.6875 234.0781,179.0313 Q235.4063,177.375 237.9063,177.375 Q238.6094,177.375 239.25,177.5313 Q239.9063,177.6875 240.4688,177.9844 L240.4688,180.7031 Q239.8438,180.125 239.25,179.8594 Q238.6563,179.5781 238.0313,179.5781 Q236.6875,179.5781 236,180.6563 Q235.3125,181.7188 235.3125,183.8125 Q235.3125,185.9063 236,186.9844 Q236.6875,188.0469 238.0313,188.0469 Q238.6563,188.0469 239.25,187.7813 Q239.8438,187.5 240.4688,186.9219 L240.4688,189.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="251.5" y="188.1543">Layer3</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="301.5" y="177.1387">Base</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="223.5" x2="328.5" y1="200" y2="200"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="223.5" x2="328.5" y1="208" y2="208"/>
-    <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="315.5"/>
+    <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="315.5"/>
     <ellipse cx="206" cy="331.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M208.9688,337.1406 Q208.3906,337.4375 207.75,337.5781 Q207.1094,337.7344 206.4063,337.7344 Q203.9063,337.7344 202.5781,336.0938 Q201.2656,334.4375 201.2656,331.3125 Q201.2656,328.1875 202.5781,326.5313 Q203.9063,324.875 206.4063,324.875 Q207.1094,324.875 207.75,325.0313 Q208.4063,325.1875 208.9688,325.4844 L208.9688,328.2031 Q208.3438,327.625 207.75,327.3594 Q207.1563,327.0781 206.5313,327.0781 Q205.1875,327.0781 204.5,328.1563 Q203.8125,329.2188 203.8125,331.3125 Q203.8125,333.4063 204.5,334.4844 Q205.1875,335.5469 206.5313,335.5469 Q207.1563,335.5469 207.75,335.2813 Q208.3438,335 208.9688,334.4219 L208.9688,337.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="220" y="335.6543">Layer2</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="270" y="324.6387">Layer3&lt;Base&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="347.5" y2="347.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="355.5" y2="355.5"/>
-    <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="401.5" y="485.5"/>
+    <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="401.5" y="485.5"/>
     <ellipse cx="416.5" cy="501.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M419.4688,507.1406 Q418.8906,507.4375 418.25,507.5781 Q417.6094,507.7344 416.9063,507.7344 Q414.4063,507.7344 413.0781,506.0938 Q411.7656,504.4375 411.7656,501.3125 Q411.7656,498.1875 413.0781,496.5313 Q414.4063,494.875 416.9063,494.875 Q417.6094,494.875 418.25,495.0313 Q418.9063,495.1875 419.4688,495.4844 L419.4688,498.2031 Q418.8438,497.625 418.25,497.3594 Q417.6563,497.0781 417.0313,497.0781 Q415.6875,497.0781 415,498.1563 Q414.3125,499.2188 414.3125,501.3125 Q414.3125,503.4063 415,504.4844 Q415.6875,505.5469 417.0313,505.5469 Q417.6563,505.5469 418.25,505.2813 Q418.8438,505 419.4688,504.4219 L419.4688,507.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="430.5" y="505.6543">Layer1</text>
@@ -107,18 +107,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="480.5" y="494.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="402.5" x2="633.5" y1="517.5" y2="517.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="402.5" x2="633.5" y1="525.5" y2="525.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmeek7bybmlwr)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="309"/>
       <ellipse cx="574.75" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M577.7188,330.6406 Q577.1406,330.9375 576.5,331.0781 Q575.8594,331.2344 575.1563,331.2344 Q572.6563,331.2344 571.3281,329.5938 Q570.0156,327.9375 570.0156,324.8125 Q570.0156,321.6875 571.3281,320.0313 Q572.6563,318.375 575.1563,318.375 Q575.8594,318.375 576.5,318.5313 Q577.1563,318.6875 577.7188,318.9844 L577.7188,321.7031 Q577.0938,321.125 576.5,320.8594 Q575.9063,320.5781 575.2813,320.5781 Q573.9375,320.5781 573.25,321.6563 Q572.5625,322.7188 572.5625,324.8125 Q572.5625,326.9063 573.25,327.9844 Q573.9375,329.0469 575.2813,329.0469 Q575.9063,329.0469 576.5,328.7813 Q577.0938,328.5 577.7188,327.9219 L577.7188,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="595.25" y="329.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="341" y2="341"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402" y="347"/>
       <ellipse cx="407" cy="352" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="416" y="355.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="361.8047" y2="361.8047"/>
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 9c455d38..01c77b71 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,6 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="360px" preserveAspectRatio="none" style="width:1144px;height:360px;" version="1.1" viewBox="0 0 1144 360" width="1144px" zoomAndPan="magnify">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="870px" preserveAspectRatio="none" style="width:754px;height:870px;" version="1.1" viewBox="0 0 754 870" width="754px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19zn6qe5mgnhk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kiirtbhanmbd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,125 +9,137 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="73.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="769" y="8"/>
-      <ellipse cx="833.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M833.3594,19.3438 L832.2031,24.4219 L834.5313,24.4219 L833.3594,19.3438 Z M831.875,17.1094 L834.8594,17.1094 L838.2188,29.5 L835.7656,29.5 L835,26.4375 L831.7188,26.4375 L830.9688,29.5 L828.5313,29.5 L831.875,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="853.75" y="28.1543">ProductA</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="770" x2="961" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="770" x2="961" y1="48" y2="48"/>
-      <ellipse cx="780" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="789" y="62.2104">~ProductA() = default : void</text>
-      <ellipse cx="780" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="789" y="75.0151">sell(int price) const = 0 : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="297.33" y="142"/>
+      <ellipse cx="361.58" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M361.6894,153.3438 L360.5331,158.4219 L362.8613,158.4219 L361.6894,153.3438 Z M360.205,151.1094 L363.1894,151.1094 L366.5488,163.5 L364.0956,163.5 L363.33,160.4375 L360.0488,160.4375 L359.2988,163.5 L356.8613,163.5 L360.205,151.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="382.08" y="162.1543">ProductA</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="298.33" x2="489.33" y1="174" y2="174"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="298.33" x2="489.33" y1="182" y2="182"/>
+      <ellipse cx="308.33" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="317.33" y="196.2104">~ProductA() = default : void</text>
+      <ellipse cx="308.33" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="317.33" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="212" y="148.5"/>
-      <ellipse cx="260.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M263.7188,170.1406 Q263.1406,170.4375 262.5,170.5781 Q261.8594,170.7344 261.1563,170.7344 Q258.6563,170.7344 257.3281,169.0938 Q256.0156,167.4375 256.0156,164.3125 Q256.0156,161.1875 257.3281,159.5313 Q258.6563,157.875 261.1563,157.875 Q261.8594,157.875 262.5,158.0313 Q263.1563,158.1875 263.7188,158.4844 L263.7188,161.2031 Q263.0938,160.625 262.5,160.3594 Q261.9063,160.0781 261.2813,160.0781 Q259.9375,160.0781 259.25,161.1563 Q258.5625,162.2188 258.5625,164.3125 Q258.5625,166.4063 259.25,167.4844 Q259.9375,168.5469 261.2813,168.5469 Q261.9063,168.5469 262.5,168.2813 Q263.0938,168 263.7188,167.4219 L263.7188,170.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="281.25" y="168.6543">ProductA1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="382" y1="180.5" y2="180.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="213" x2="382" y1="188.5" y2="188.5"/>
-      <ellipse cx="223" cy="199.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="232" y="202.7104">sell(int price) const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="169.33" y="276"/>
+      <ellipse cx="218.08" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M221.0488,297.6406 Q220.4706,297.9375 219.83,298.0781 Q219.1894,298.2344 218.4863,298.2344 Q215.9863,298.2344 214.6581,296.5938 Q213.3456,294.9375 213.3456,291.8125 Q213.3456,288.6875 214.6581,287.0313 Q215.9863,285.375 218.4863,285.375 Q219.1894,285.375 219.83,285.5313 Q220.4863,285.6875 221.0488,285.9844 L221.0488,288.7031 Q220.4238,288.125 219.83,287.8594 Q219.2363,287.5781 218.6113,287.5781 Q217.2675,287.5781 216.58,288.6563 Q215.8925,289.7188 215.8925,291.8125 Q215.8925,293.9063 216.58,294.9844 Q217.2675,296.0469 218.6113,296.0469 Q219.2363,296.0469 219.83,295.7813 Q220.4238,295.5 221.0488,294.9219 L221.0488,297.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="238.58" y="296.1543">ProductA1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="170.33" x2="339.33" y1="308" y2="308"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="170.33" x2="339.33" y1="316" y2="316"/>
+      <ellipse cx="180.33" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="189.33" y="330.2104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="962" y="148.5"/>
-      <ellipse cx="1010.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M1013.7188,170.1406 Q1013.1406,170.4375 1012.5,170.5781 Q1011.8594,170.7344 1011.1563,170.7344 Q1008.6563,170.7344 1007.3281,169.0938 Q1006.0156,167.4375 1006.0156,164.3125 Q1006.0156,161.1875 1007.3281,159.5313 Q1008.6563,157.875 1011.1563,157.875 Q1011.8594,157.875 1012.5,158.0313 Q1013.1563,158.1875 1013.7188,158.4844 L1013.7188,161.2031 Q1013.0938,160.625 1012.5,160.3594 Q1011.9063,160.0781 1011.2813,160.0781 Q1009.9375,160.0781 1009.25,161.1563 Q1008.5625,162.2188 1008.5625,164.3125 Q1008.5625,166.4063 1009.25,167.4844 Q1009.9375,168.5469 1011.2813,168.5469 Q1011.9063,168.5469 1012.5,168.2813 Q1013.0938,168 1013.7188,167.4219 L1013.7188,170.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="1031.25" y="168.6543">ProductA2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="963" x2="1132" y1="180.5" y2="180.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="963" x2="1132" y1="188.5" y2="188.5"/>
-      <ellipse cx="973" cy="199.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="982" y="202.7104">sell(int price) const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="518.33" y="403.5"/>
+      <ellipse cx="567.08" cy="419.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M570.0488,425.1406 Q569.4706,425.4375 568.83,425.5781 Q568.1894,425.7344 567.4863,425.7344 Q564.9863,425.7344 563.6581,424.0938 Q562.3456,422.4375 562.3456,419.3125 Q562.3456,416.1875 563.6581,414.5313 Q564.9863,412.875 567.4863,412.875 Q568.1894,412.875 568.83,413.0313 Q569.4863,413.1875 570.0488,413.4844 L570.0488,416.2031 Q569.4238,415.625 568.83,415.3594 Q568.2363,415.0781 567.6113,415.0781 Q566.2675,415.0781 565.58,416.1563 Q564.8925,417.2188 564.8925,419.3125 Q564.8925,421.4063 565.58,422.4844 Q566.2675,423.5469 567.6113,423.5469 Q568.2363,423.5469 568.83,423.2813 Q569.4238,423 570.0488,422.4219 L570.0488,425.1406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="587.58" y="423.6543">ProductA2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="519.33" x2="688.33" y1="435.5" y2="435.5"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="519.33" x2="688.33" y1="443.5" y2="443.5"/>
+      <ellipse cx="529.33" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="538.33" y="457.7104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="73.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="357" y="8"/>
-      <ellipse cx="422.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M422.3594,19.3438 L421.2031,24.4219 L423.5313,24.4219 L422.3594,19.3438 Z M420.875,17.1094 L423.8594,17.1094 L427.2188,29.5 L424.7656,29.5 L424,26.4375 L420.7188,26.4375 L419.9688,29.5 L417.5313,29.5 L420.875,17.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="442.75" y="28.1543">ProductB</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358" x2="551" y1="40" y2="40"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="358" x2="551" y1="48" y2="48"/>
-      <ellipse cx="368" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="159" x="377" y="62.2104">~ProductB() = default : void</text>
-      <ellipse cx="368" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="377" y="75.0151">buy(int price) const = 0 : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="22.33" y="531"/>
+      <ellipse cx="87.58" cy="547" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M87.6894,542.3438 L86.5331,547.4219 L88.8613,547.4219 L87.6894,542.3438 Z M86.205,540.1094 L89.1894,540.1094 L92.5488,552.5 L90.0956,552.5 L89.33,549.4375 L86.0488,549.4375 L85.2988,552.5 L82.8613,552.5 L86.205,540.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="108.08" y="551.1543">ProductB</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.33" x2="216.33" y1="563" y2="563"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="23.33" x2="216.33" y1="571" y2="571"/>
+      <ellipse cx="33.33" cy="582" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="159" x="42.33" y="585.2104">~ProductB() = default : void</text>
+      <ellipse cx="33.33" cy="594.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="42.33" y="598.0151">buy(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="6" y="148.5"/>
-      <ellipse cx="54.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M57.7188,170.1406 Q57.1406,170.4375 56.5,170.5781 Q55.8594,170.7344 55.1563,170.7344 Q52.6563,170.7344 51.3281,169.0938 Q50.0156,167.4375 50.0156,164.3125 Q50.0156,161.1875 51.3281,159.5313 Q52.6563,157.875 55.1563,157.875 Q55.8594,157.875 56.5,158.0313 Q57.1563,158.1875 57.7188,158.4844 L57.7188,161.2031 Q57.0938,160.625 56.5,160.3594 Q55.9063,160.0781 55.2813,160.0781 Q53.9375,160.0781 53.25,161.1563 Q52.5625,162.2188 52.5625,164.3125 Q52.5625,166.4063 53.25,167.4844 Q53.9375,168.5469 55.2813,168.5469 Q55.9063,168.5469 56.5,168.2813 Q57.0938,168 57.7188,167.4219 L57.7188,170.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="75.25" y="168.6543">ProductB1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="180.5" y2="180.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="176" y1="188.5" y2="188.5"/>
-      <ellipse cx="17" cy="199.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="26" y="202.7104">buy(int price) const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="240.33" y="665"/>
+      <ellipse cx="289.08" cy="681" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M292.0488,686.6406 Q291.4706,686.9375 290.83,687.0781 Q290.1894,687.2344 289.4863,687.2344 Q286.9863,687.2344 285.6581,685.5938 Q284.3456,683.9375 284.3456,680.8125 Q284.3456,677.6875 285.6581,676.0313 Q286.9863,674.375 289.4863,674.375 Q290.1894,674.375 290.83,674.5313 Q291.4863,674.6875 292.0488,674.9844 L292.0488,677.7031 Q291.4238,677.125 290.83,676.8594 Q290.2363,676.5781 289.6113,676.5781 Q288.2675,676.5781 287.58,677.6563 Q286.8925,678.7188 286.8925,680.8125 Q286.8925,682.9063 287.58,683.9844 Q288.2675,685.0469 289.6113,685.0469 Q290.2363,685.0469 290.83,684.7813 Q291.4238,684.5 292.0488,683.9219 L292.0488,686.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="309.58" y="685.1543">ProductB1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="241.33" x2="410.33" y1="697" y2="697"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="241.33" x2="410.33" y1="705" y2="705"/>
+      <ellipse cx="251.33" cy="716" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="260.33" y="719.2104">buy(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="756" y="148.5"/>
-      <ellipse cx="804.75" cy="164.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M807.7188,170.1406 Q807.1406,170.4375 806.5,170.5781 Q805.8594,170.7344 805.1563,170.7344 Q802.6563,170.7344 801.3281,169.0938 Q800.0156,167.4375 800.0156,164.3125 Q800.0156,161.1875 801.3281,159.5313 Q802.6563,157.875 805.1563,157.875 Q805.8594,157.875 806.5,158.0313 Q807.1563,158.1875 807.7188,158.4844 L807.7188,161.2031 Q807.0938,160.625 806.5,160.3594 Q805.9063,160.0781 805.2813,160.0781 Q803.9375,160.0781 803.25,161.1563 Q802.5625,162.2188 802.5625,164.3125 Q802.5625,166.4063 803.25,167.4844 Q803.9375,168.5469 805.2813,168.5469 Q805.9063,168.5469 806.5,168.2813 Q807.0938,168 807.7188,167.4219 L807.7188,170.1406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="825.25" y="168.6543">ProductB2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="926" y1="180.5" y2="180.5"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="757" x2="926" y1="188.5" y2="188.5"/>
-      <ellipse cx="767" cy="199.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="776" y="202.7104">buy(int price) const : bool</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="34.33" y="665"/>
+      <ellipse cx="83.08" cy="681" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M86.0488,686.6406 Q85.4706,686.9375 84.83,687.0781 Q84.1894,687.2344 83.4863,687.2344 Q80.9863,687.2344 79.6581,685.5938 Q78.3456,683.9375 78.3456,680.8125 Q78.3456,677.6875 79.6581,676.0313 Q80.9863,674.375 83.4863,674.375 Q84.1894,674.375 84.83,674.5313 Q85.4863,674.6875 86.0488,674.9844 L86.0488,677.7031 Q85.4238,677.125 84.83,676.8594 Q84.2363,676.5781 83.6113,676.5781 Q82.2675,676.5781 81.58,677.6563 Q80.8925,678.7188 80.8925,680.8125 Q80.8925,682.9063 81.58,683.9844 Q82.2675,685.0469 83.6113,685.0469 Q84.2363,685.0469 84.83,684.7813 Q85.4238,684.5 86.0488,683.9219 L86.0488,686.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="103.58" y="685.1543">ProductB2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.33" x2="204.33" y1="697" y2="697"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.33" x2="204.33" y1="705" y2="705"/>
+      <ellipse cx="45.33" cy="716" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="54.33" y="719.2104">buy(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="418.5" y="142"/>
-      <ellipse cx="515.75" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M515.8594,153.3438 L514.7031,158.4219 L517.0313,158.4219 L515.8594,153.3438 Z M514.375,151.1094 L517.3594,151.1094 L520.7188,163.5 L518.2656,163.5 L517.5,160.4375 L514.2188,160.4375 L513.4688,163.5 L511.0313,163.5 L514.375,151.1094 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="536.25" y="162.1543">AbstractFactory</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419.5" x2="719.5" y1="174" y2="174"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="419.5" x2="719.5" y1="182" y2="182"/>
-      <ellipse cx="429.5" cy="193" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="438.5" y="196.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
-      <ellipse cx="429.5" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="438.5" y="209.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="103.83" y="8"/>
+      <ellipse cx="201.08" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M201.1894,19.3438 L200.0331,24.4219 L202.3612,24.4219 L201.1894,19.3438 Z M199.705,17.1094 L202.6894,17.1094 L206.0487,29.5 L203.5956,29.5 L202.83,26.4375 L199.5487,26.4375 L198.7987,29.5 L196.3612,29.5 L199.705,17.1094 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="221.58" y="28.1543">AbstractFactory</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="104.83" x2="404.83" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="104.83" x2="404.83" y1="48" y2="48"/>
+      <ellipse cx="114.83" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="123.83" y="62.2104">make_a() const = 0 : std::unique_ptr&lt;ProductA&gt;</text>
+      <ellipse cx="114.83" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="123.83" y="75.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="157.5" y="276"/>
-      <ellipse cx="266.25" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M269.2188,297.6406 Q268.6406,297.9375 268,298.0781 Q267.3594,298.2344 266.6563,298.2344 Q264.1563,298.2344 262.8281,296.5938 Q261.5156,294.9375 261.5156,291.8125 Q261.5156,288.6875 262.8281,287.0313 Q264.1563,285.375 266.6563,285.375 Q267.3594,285.375 268,285.5313 Q268.6563,285.6875 269.2188,285.9844 L269.2188,288.7031 Q268.5938,288.125 268,287.8594 Q267.4063,287.5781 266.7813,287.5781 Q265.4375,287.5781 264.75,288.6563 Q264.0625,289.7188 264.0625,291.8125 Q264.0625,293.9063 264.75,294.9844 Q265.4375,296.0469 266.7813,296.0469 Q267.4063,296.0469 268,295.7813 Q268.5938,295.5 269.2188,294.9219 L269.2188,297.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="286.75" y="296.1543">Factory1</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="436.5" y1="308" y2="308"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="436.5" y1="316" y2="316"/>
-      <ellipse cx="168.5" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="177.5" y="330.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
-      <ellipse cx="168.5" cy="339.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="177.5" y="343.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="114.83" y="397"/>
+      <ellipse cx="223.58" cy="413" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M226.5487,418.6406 Q225.9706,418.9375 225.33,419.0781 Q224.6894,419.2344 223.9862,419.2344 Q221.4862,419.2344 220.1581,417.5938 Q218.8456,415.9375 218.8456,412.8125 Q218.8456,409.6875 220.1581,408.0313 Q221.4862,406.375 223.9862,406.375 Q224.6894,406.375 225.33,406.5313 Q225.9862,406.6875 226.5487,406.9844 L226.5487,409.7031 Q225.9237,409.125 225.33,408.8594 Q224.7362,408.5781 224.1112,408.5781 Q222.7675,408.5781 222.08,409.6563 Q221.3925,410.7188 221.3925,412.8125 Q221.3925,414.9063 222.08,415.9844 Q222.7675,417.0469 224.1112,417.0469 Q224.7362,417.0469 225.33,416.7813 Q225.9237,416.5 226.5487,415.9219 L226.5487,418.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="244.08" y="417.1543">Factory1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="115.83" x2="393.83" y1="429" y2="429"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="115.83" x2="393.83" y1="437" y2="437"/>
+      <ellipse cx="125.83" cy="448" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="134.83" y="451.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
+      <ellipse cx="125.83" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="134.83" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19zn6qe5mgnhk)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="701.5" y="276"/>
-      <ellipse cx="810.25" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
-      <path d="M813.2188,297.6406 Q812.6406,297.9375 812,298.0781 Q811.3594,298.2344 810.6563,298.2344 Q808.1563,298.2344 806.8281,296.5938 Q805.5156,294.9375 805.5156,291.8125 Q805.5156,288.6875 806.8281,287.0313 Q808.1563,285.375 810.6563,285.375 Q811.3594,285.375 812,285.5313 Q812.6563,285.6875 813.2188,285.9844 L813.2188,288.7031 Q812.5938,288.125 812,287.8594 Q811.4063,287.5781 810.7813,287.5781 Q809.4375,287.5781 808.75,288.6563 Q808.0625,289.7188 808.0625,291.8125 Q808.0625,293.9063 808.75,294.9844 Q809.4375,296.0469 810.7813,296.0469 Q811.4063,296.0469 812,295.7813 Q812.5938,295.5 813.2188,294.9219 L813.2188,297.6406 Z "/>
-      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="830.75" y="296.1543">Factory2</text>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="702.5" x2="980.5" y1="308" y2="308"/>
-      <line style="stroke: #A80036; stroke-width: 1.5;" x1="702.5" x2="980.5" y1="316" y2="316"/>
-      <ellipse cx="712.5" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="721.5" y="330.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
-      <ellipse cx="712.5" cy="339.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
-      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="721.5" y="343.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="324.83" y="786"/>
+      <ellipse cx="433.58" cy="802" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M436.5488,807.6406 Q435.9706,807.9375 435.33,808.0781 Q434.6894,808.2344 433.9863,808.2344 Q431.4863,808.2344 430.1581,806.5938 Q428.8456,804.9375 428.8456,801.8125 Q428.8456,798.6875 430.1581,797.0313 Q431.4863,795.375 433.9863,795.375 Q434.6894,795.375 435.33,795.5313 Q435.9863,795.6875 436.5488,795.9844 L436.5488,798.7031 Q435.9238,798.125 435.33,797.8594 Q434.7363,797.5781 434.1113,797.5781 Q432.7675,797.5781 432.08,798.6563 Q431.3925,799.7188 431.3925,801.8125 Q431.3925,803.9063 432.08,804.9844 Q432.7675,806.0469 434.1113,806.0469 Q434.7363,806.0469 435.33,805.7813 Q435.9238,805.5 436.5488,804.9219 L436.5488,807.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="454.08" y="806.1543">Factory2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="325.83" x2="603.83" y1="818" y2="818"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="325.83" x2="603.83" y1="826" y2="826"/>
+      <ellipse cx="335.83" cy="837" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="253" x="344.83" y="840.2104">make_a() const : std::unique_ptr&lt;ProductA&gt;</text>
+      <ellipse cx="335.83" cy="849.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="344.83" y="853.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <path d="M748.87,65.81 C654.43,82.89 518.37,109.83 401.5,142 C394.41,143.95 387.1,146.13 379.79,148.43 " fill="none" id="C_0000425267229659464944&lt;-C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="747.74,58.9,768.66,62.27,750.21,72.68,747.74,58.9" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M931.67,93.99 C956.78,112.2 984.63,132.4 1006.73,148.43 " fill="none" id="C_0000425267229659464944&lt;-C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="927.31,99.48,915.23,82.07,935.53,88.15,927.31,99.48" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M337.74,88.46 C283.96,108.02 221.44,130.75 172.86,148.41 " fill="none" id="C_0002235759006374865842&lt;-C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="335.56,81.8,356.75,81.55,340.34,94.96,335.56,81.8" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M571.34,85.2 C622.67,102.49 683.62,123.13 738.5,142 C744.59,144.09 750.88,146.27 757.21,148.46 " fill="none" id="C_0002235759006374865842&lt;-C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="568.9,91.76,552.18,78.74,573.37,78.49,568.9,91.76" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M477.11,224.83 C442.76,241.51 404.26,260.19 371.74,275.97 " fill="none" id="C_0001705546469218961425&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="474.13,218.5,495.17,216.07,480.24,231.1,474.13,218.5" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M661.89,224.83 C696.24,241.51 734.74,260.19 767.26,275.97 " fill="none" id="C_0001705546469218961425&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <polygon fill="none" points="658.76,231.1,643.83,216.07,664.87,218.5,658.76,231.1" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M297.5,214.81 C297.5,233.64 297.5,256.87 297.5,275.89 " fill="none" id="C_0001756496029797864207&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="297.5,209.62,293.5,218.62,297.5,214.62,301.5,218.62,297.5,209.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M142.1,212.42 C172.1,231.65 210.19,256.05 241.15,275.89 " fill="none" id="C_0001465493024233223845&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="137.73,209.62,143.1574,217.8385,141.9424,212.3136,147.4672,211.0986,137.73,209.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M996.9,212.42 C966.9,231.65 928.81,256.05 897.85,275.89 " fill="none" id="C_0001531708592885216981&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="1001.27,209.62,991.5328,211.0986,997.0576,212.3136,995.8426,217.8385,1001.27,209.62" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M841.5,214.81 C841.5,233.64 841.5,256.87 841.5,275.89 " fill="none" id="C_0002154665562370057871&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <polygon fill="#A80036" points="841.5,209.62,837.5,218.62,841.5,214.62,845.5,218.62,841.5,209.62" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M338.65,229.82 C321.48,245.33 303.09,261.93 287.92,275.62 " fill="none" id="C_0000425267229659464944&lt;-C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="334.09,224.51,353.63,216.3,343.47,234.9,334.09,224.51" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M448.16,230.61 C462.53,244.83 477.69,260.63 490.83,276 C526.72,317.99 563.15,370.85 584.6,403.26 " fill="none" id="C_0000425267229659464944&lt;-C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="443.04,235.4,433.58,216.44,452.8,225.36,443.04,235.4" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M196.47,615.69 C223.55,632.19 253.24,650.28 277.34,664.96 " fill="none" id="C_0002235759006374865842&lt;-C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="192.58,621.51,179.14,605.13,199.86,609.56,192.58,621.51" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M119.83,625.73 C119.83,639.15 119.83,652.95 119.83,664.62 " fill="none" id="C_0002235759006374865842&lt;-C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="112.83,625.3,119.83,605.3,126.83,625.3,112.83,625.3" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M292.81,82.07 C311.2,99.53 333.32,120.54 352.17,138.44 " fill="none" id="C_0001705546469218961425-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="355.9,141.97,352.1244,132.8736,352.2729,138.5285,346.618,138.677,355.9,141.97" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M198.1,82.19 C177.59,98.1 156.22,118.53 142.83,142 C69.7,270.19 81.24,324.35 97.83,471 C99.89,489.17 104.06,508.91 108.23,525.74 " fill="none" id="C_0001705546469218961425-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="109.52,530.86,111.2177,521.1586,108.3073,526.0093,103.4566,523.0989,109.52,530.86" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M304.82,397 C324.06,380.72 344.58,359.98 357.83,337 C378.45,301.24 387.26,254.52 391.02,221.37 " fill="none" id="C_0000692346848484854107-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="391.58,216.17,386.6509,224.6967,391.0514,221.142,394.606,225.5425,391.58,216.17" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217.94,471.07 C200.08,488.53 178.6,509.54 160.29,527.44 " fill="none" id="C_0000692346848484854107-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="156.68,530.97,165.9146,527.5464,160.2582,527.4777,160.3269,521.8212,156.68,530.97" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M212.51,98.25 C170.26,157.16 116.33,255.37 151.83,337 C162.12,360.65 181.42,381.11 200.56,396.99 " fill="none" id="C_0001705546469218961425&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="207.04,93.88,224.59,82.01,218.27,102.24,207.04,93.88" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M464.83,785.97 C464.83,736.9 464.83,646.31 464.83,569 C464.83,433 464.83,433 464.83,433 C464.83,355.88 433.87,270.29 412.84,221.05 " fill="none" id="C_0001566325870805013023-&gt;C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="410.84,216.39,410.7457,226.2384,412.8268,220.9783,418.0869,223.0595,410.84,216.39" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M324.77,810.93 C208.14,798.45 55.15,773.4 16.83,726 C-13.62,688.33 25.98,641.5 64.56,608.83 " fill="none" id="C_0001566325870805013023-&gt;C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="68.78,605.32,59.3092,608.0227,64.9436,608.5266,64.4397,614.1609,68.78,605.32" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M425.92,66.46 C566.58,93.96 742.83,157.87 742.83,305.5 C742.83,305.5 742.83,305.5 742.83,569 C742.83,673.41 634.24,746.14 552.79,786 " fill="none" id="C_0001705546469218961425&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <polygon fill="none" points="424.28,73.28,405.9,62.74,426.84,59.51,424.28,73.28" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M254.83,342.38 C254.83,359.31 254.83,379.65 254.83,396.76 " fill="none" id="C_0001756496029797864207&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="254.83,337.24,250.83,346.24,254.83,342.24,258.83,346.24,254.83,337.24" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M316.35,659.83 C302.89,610.65 278.37,521.03 264.7,471.08 " fill="none" id="C_0001465493024233223845&lt;-C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="317.69,664.76,319.1786,655.0243,316.3732,659.9365,311.461,657.1312,317.69,664.76" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M591.33,469.82 C565.09,542.88 504.5,711.55 477.83,785.8 " fill="none" id="C_0001531708592885216981&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="593.16,464.72,586.3564,471.8412,591.472,469.4264,593.8867,474.542,593.16,464.72" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M206.1,727.88 C254.54,745.5 315.19,767.56 365.59,785.9 " fill="none" id="C_0002154665562370057871&lt;-C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="201.15,726.08,208.2528,732.9027,205.8519,727.7807,210.9739,725.3797,201.15,726.08" style="stroke: #A80036; stroke-width: 1.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 1a63ef92..623b8745 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:990px;height:493px;" version="1.1" viewBox="0 0 990 493" width="990px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1f7lg28fe0qhn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lgp47vrnjaj8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="86.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="86.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="142"/>
       <ellipse cx="469.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.3594,153.3438 L468.2031,158.4219 L470.5313,158.4219 L469.3594,153.3438 Z M467.875,151.1094 L470.8594,151.1094 L474.2188,163.5 L471.7656,163.5 L471,160.4375 L467.7188,160.4375 L466.9688,163.5 L464.5313,163.5 L467.875,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="162.1543">Visitor</text>
@@ -23,8 +23,8 @@
       <ellipse cx="379" cy="218.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="221.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="288"/>
       <ellipse cx="202.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M205.7188,309.6406 Q205.1406,309.9375 204.5,310.0781 Q203.8594,310.2344 203.1563,310.2344 Q200.6563,310.2344 199.3281,308.5938 Q198.0156,306.9375 198.0156,303.8125 Q198.0156,300.6875 199.3281,299.0313 Q200.6563,297.375 203.1563,297.375 Q203.8594,297.375 204.5,297.5313 Q205.1563,297.6875 205.7188,297.9844 L205.7188,300.7031 Q205.0938,300.125 204.5,299.8594 Q203.9063,299.5781 203.2813,299.5781 Q201.9375,299.5781 201.25,300.6563 Q200.5625,301.7188 200.5625,303.8125 Q200.5625,305.9063 201.25,306.9844 Q201.9375,308.0469 203.2813,308.0469 Q203.9063,308.0469 204.5,307.7813 Q205.0938,307.5 205.7188,306.9219 L205.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="308.1543">Visitor1</text>
@@ -35,8 +35,8 @@
       <ellipse cx="128" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="288"/>
       <ellipse cx="464.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.7188,309.6406 Q467.1406,309.9375 466.5,310.0781 Q465.8594,310.2344 465.1563,310.2344 Q462.6563,310.2344 461.3281,308.5938 Q460.0156,306.9375 460.0156,303.8125 Q460.0156,300.6875 461.3281,299.0313 Q462.6563,297.375 465.1563,297.375 Q465.8594,297.375 466.5,297.5313 Q467.1563,297.6875 467.7188,297.9844 L467.7188,300.7031 Q467.0938,300.125 466.5,299.8594 Q465.9063,299.5781 465.2813,299.5781 Q463.9375,299.5781 463.25,300.6563 Q462.5625,301.7188 462.5625,303.8125 Q462.5625,305.9063 463.25,306.9844 Q463.9375,308.0469 465.2813,308.0469 Q465.9063,308.0469 466.5,307.7813 Q467.0938,307.5 467.7188,306.9219 L467.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="308.1543">Visitor2</text>
@@ -47,8 +47,8 @@
       <ellipse cx="390" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="288"/>
       <ellipse cx="726.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M729.7188,309.6406 Q729.1406,309.9375 728.5,310.0781 Q727.8594,310.2344 727.1563,310.2344 Q724.6563,310.2344 723.3281,308.5938 Q722.0156,306.9375 722.0156,303.8125 Q722.0156,300.6875 723.3281,299.0313 Q724.6563,297.375 727.1563,297.375 Q727.8594,297.375 728.5,297.5313 Q729.1563,297.6875 729.7188,297.9844 L729.7188,300.7031 Q729.0938,300.125 728.5,299.8594 Q727.9063,299.5781 727.2813,299.5781 Q725.9375,299.5781 725.25,300.6563 Q724.5625,301.7188 724.5625,303.8125 Q724.5625,305.9063 725.25,306.9844 Q725.9375,308.0469 727.2813,308.0469 Q727.9063,308.0469 728.5,307.7813 Q729.0938,307.5 729.7188,306.9219 L729.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="308.1543">Visitor3</text>
@@ -59,8 +59,8 @@
       <ellipse cx="652" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="73.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
       <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
@@ -71,8 +71,8 @@
       <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="422"/>
       <ellipse cx="130.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M133.2188,443.6406 Q132.6406,443.9375 132,444.0781 Q131.3594,444.2344 130.6563,444.2344 Q128.1563,444.2344 126.8281,442.5938 Q125.5156,440.9375 125.5156,437.8125 Q125.5156,434.6875 126.8281,433.0313 Q128.1563,431.375 130.6563,431.375 Q131.3594,431.375 132,431.5313 Q132.6563,431.6875 133.2188,431.9844 L133.2188,434.7031 Q132.5938,434.125 132,433.8594 Q131.4063,433.5781 130.7813,433.5781 Q129.4375,433.5781 128.75,434.6563 Q128.0625,435.7188 128.0625,437.8125 Q128.0625,439.9063 128.75,440.9844 Q129.4375,442.0469 130.7813,442.0469 Q131.4063,442.0469 132,441.7813 Q132.5938,441.5 133.2188,440.9219 L133.2188,443.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="442.1543">A</text>
@@ -81,8 +81,8 @@
       <ellipse cx="17" cy="473" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="476.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f7lg28fe0qhn)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="422"/>
       <ellipse cx="838.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.2188,443.6406 Q840.6406,443.9375 840,444.0781 Q839.3594,444.2344 838.6563,444.2344 Q836.1563,444.2344 834.8281,442.5938 Q833.5156,440.9375 833.5156,437.8125 Q833.5156,434.6875 834.8281,433.0313 Q836.1563,431.375 838.6563,431.375 Q839.3594,431.375 840,431.5313 Q840.6563,431.6875 841.2188,431.9844 L841.2188,434.7031 Q840.5938,434.125 840,433.8594 Q839.4063,433.5781 838.7813,433.5781 Q837.4375,433.5781 836.75,434.6563 Q836.0625,435.7188 836.0625,437.8125 Q836.0625,439.9063 836.75,440.9844 Q837.4375,442.0469 838.7813,442.0469 Q839.4063,442.0469 840,441.7813 Q840.5938,441.5 841.2188,440.9219 L841.2188,443.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="442.1543">B</text>
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index babc0c0e..cc6ca49e 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="238px" preserveAspectRatio="none" style="width:290px;height:238px;" version="1.1" viewBox="0 0 290 238" width="290px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1b7io1z63xqqa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6sdjs0aiyflj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1b7io1z63xqqa)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6sdjs0aiyflj)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
       <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
@@ -23,8 +23,8 @@
       <polygon fill="#FFFF44" points="69.5,79.6094,73.5,83.6094,69.5,87.6094,65.5,83.6094" style="stroke: #B38D22; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="87.8198">method2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1b7io1z63xqqa)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6sdjs0aiyflj)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
       <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
@@ -35,8 +35,8 @@
       <polygon fill="#FFFF44" points="17,212.8047,21,216.8047,17,220.8047,13,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="221.0151">method2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1b7io1z63xqqa)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6sdjs0aiyflj)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
       <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index 14cf1461..e84d99a3 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="377px" preserveAspectRatio="none" style="width:456px;height:377px;" version="1.1" viewBox="0 0 456 377" width="456px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6u7asdpygegk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1l8xh7dwp1nsa" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6u7asdpygegk)" height="73.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="134.5" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="73.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="134.5" y="171"/>
       <ellipse cx="194.25" cy="187" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.3594,182.3438 L193.2031,187.4219 L195.5313,187.4219 L194.3594,182.3438 Z M192.875,180.1094 L195.8594,180.1094 L199.2188,192.5 L196.7656,192.5 L196,189.4375 L192.7188,189.4375 L191.9688,192.5 L189.5313,192.5 L192.875,180.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="191.1543">Strategy</text>
@@ -21,8 +21,8 @@
       <ellipse cx="145.5" cy="234.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="154.5" y="238.0151">algorithm() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6u7asdpygegk)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/>
       <ellipse cx="34.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M37.4688,327.6406 Q36.8906,327.9375 36.25,328.0781 Q35.6094,328.2344 34.9063,328.2344 Q32.4063,328.2344 31.0781,326.5938 Q29.7656,324.9375 29.7656,321.8125 Q29.7656,318.6875 31.0781,317.0313 Q32.4063,315.375 34.9063,315.375 Q35.6094,315.375 36.25,315.5313 Q36.9063,315.6875 37.4688,315.9844 L37.4688,318.7031 Q36.8438,318.125 36.25,317.8594 Q35.6563,317.5781 35.0313,317.5781 Q33.6875,317.5781 33,318.6563 Q32.3125,319.7188 32.3125,321.8125 Q32.3125,323.9063 33,324.9844 Q33.6875,326.0469 35.0313,326.0469 Q35.6563,326.0469 36.25,325.7813 Q36.8438,325.5 37.4688,324.9219 L37.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="326.1543">StrategyA</text>
@@ -31,8 +31,8 @@
       <ellipse cx="17" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6u7asdpygegk)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/>
       <ellipse cx="192.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.4688,327.6406 Q194.8906,327.9375 194.25,328.0781 Q193.6094,328.2344 192.9063,328.2344 Q190.4063,328.2344 189.0781,326.5938 Q187.7656,324.9375 187.7656,321.8125 Q187.7656,318.6875 189.0781,317.0313 Q190.4063,315.375 192.9063,315.375 Q193.6094,315.375 194.25,315.5313 Q194.9063,315.6875 195.4688,315.9844 L195.4688,318.7031 Q194.8438,318.125 194.25,317.8594 Q193.6563,317.5781 193.0313,317.5781 Q191.6875,317.5781 191,318.6563 Q190.3125,319.7188 190.3125,321.8125 Q190.3125,323.9063 191,324.9844 Q191.6875,326.0469 193.0313,326.0469 Q193.6563,326.0469 194.25,325.7813 Q194.8438,325.5 195.4688,324.9219 L195.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="326.1543">StrategyB</text>
@@ -41,8 +41,8 @@
       <ellipse cx="175" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6u7asdpygegk)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/>
       <ellipse cx="350.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M353.4688,327.6406 Q352.8906,327.9375 352.25,328.0781 Q351.6094,328.2344 350.9063,328.2344 Q348.4063,328.2344 347.0781,326.5938 Q345.7656,324.9375 345.7656,321.8125 Q345.7656,318.6875 347.0781,317.0313 Q348.4063,315.375 350.9063,315.375 Q351.6094,315.375 352.25,315.5313 Q352.9063,315.6875 353.4688,315.9844 L353.4688,318.7031 Q352.8438,318.125 352.25,317.8594 Q351.6563,317.5781 351.0313,317.5781 Q349.6875,317.5781 349,318.6563 Q348.3125,319.7188 348.3125,321.8125 Q348.3125,323.9063 349,324.9844 Q349.6875,326.0469 351.0313,326.0469 Q351.6563,326.0469 352.25,325.7813 Q352.8438,325.5 353.4688,324.9219 L353.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="326.1543">StrategyC</text>
@@ -51,18 +51,18 @@
       <ellipse cx="333" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6u7asdpygegk)" height="86.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="86.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
       <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="54.2104">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index b70eb1bd..9b835b4b 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="281px" preserveAspectRatio="none" style="width:542px;height:281px;" version="1.1" viewBox="0 0 542 281" width="542px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19eeiprfcdw6r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgl108beyvrp8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19eeiprfcdw6r)" height="86.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="245.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="86.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="245.5" y="8"/>
       <ellipse cx="290.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M290.8594,19.3438 L289.7031,24.4219 L292.0313,24.4219 L290.8594,19.3438 Z M289.375,17.1094 L292.3594,17.1094 L295.7188,29.5 L293.2656,29.5 L292.5,26.4375 L289.2188,26.4375 L288.4688,29.5 L286.0313,29.5 L289.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="311.25" y="28.1543">Target</text>
@@ -23,8 +23,8 @@
       <ellipse cx="256.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="265.5" y="87.8198">m2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19eeiprfcdw6r)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/>
       <ellipse cx="23.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,205.1406 Q26.0906,205.4375 25.45,205.5781 Q24.8094,205.7344 24.1063,205.7344 Q21.6063,205.7344 20.2781,204.0938 Q18.9656,202.4375 18.9656,199.3125 Q18.9656,196.1875 20.2781,194.5313 Q21.6063,192.875 24.1063,192.875 Q24.8094,192.875 25.45,193.0313 Q26.1063,193.1875 26.6688,193.4844 L26.6688,196.2031 Q26.0438,195.625 25.45,195.3594 Q24.8563,195.0781 24.2313,195.0781 Q22.8875,195.0781 22.2,196.1563 Q21.5125,197.2188 21.5125,199.3125 Q21.5125,201.4063 22.2,202.4844 Q22.8875,203.5469 24.2313,203.5469 Q24.8563,203.5469 25.45,203.2813 Q26.0438,203 26.6688,202.4219 L26.6688,205.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="203.6543">Target1</text>
@@ -35,8 +35,8 @@
       <ellipse cx="17" cy="247.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="250.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19eeiprfcdw6r)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/>
       <ellipse cx="145.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.6688,205.1406 Q148.0906,205.4375 147.45,205.5781 Q146.8094,205.7344 146.1063,205.7344 Q143.6063,205.7344 142.2781,204.0938 Q140.9656,202.4375 140.9656,199.3125 Q140.9656,196.1875 142.2781,194.5313 Q143.6063,192.875 146.1063,192.875 Q146.8094,192.875 147.45,193.0313 Q148.1063,193.1875 148.6688,193.4844 L148.6688,196.2031 Q148.0438,195.625 147.45,195.3594 Q146.8563,195.0781 146.2313,195.0781 Q144.8875,195.0781 144.2,196.1563 Q143.5125,197.2188 143.5125,199.3125 Q143.5125,201.4063 144.2,202.4844 Q144.8875,203.5469 146.2313,203.5469 Q146.8563,203.5469 147.45,203.2813 Q148.0438,203 148.6688,202.4219 L148.6688,205.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="203.6543">Target2</text>
@@ -47,18 +47,18 @@
       <ellipse cx="139" cy="247.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="250.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19eeiprfcdw6r)" height="99.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="99.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/>
       <ellipse cx="369.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M372.7188,192.6406 Q372.1406,192.9375 371.5,193.0781 Q370.8594,193.2344 370.1563,193.2344 Q367.6563,193.2344 366.3281,191.5938 Q365.0156,189.9375 365.0156,186.8125 Q365.0156,183.6875 366.3281,182.0313 Q367.6563,180.375 370.1563,180.375 Q370.8594,180.375 371.5,180.5313 Q372.1563,180.6875 372.7188,180.9844 L372.7188,183.7031 Q372.0938,183.125 371.5,182.8594 Q370.9063,182.5781 370.2813,182.5781 Q368.9375,182.5781 368.25,183.6563 Q367.5625,184.7188 367.5625,186.8125 Q367.5625,188.9063 368.25,189.9844 Q368.9375,191.0469 370.2813,191.0469 Q370.9063,191.0469 371.5,190.7813 Q372.0938,190.5 372.7188,189.9219 L372.7188,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="191.1543">Proxy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="203" y2="203"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="209"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="217.2104">m_target : std::shared_ptr&lt;Target&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="223.8047" y2="223.8047"/>
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index 98c698ef..dc83dc96 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="378px" preserveAspectRatio="none" style="width:538px;height:378px;" version="1.1" viewBox="0 0 538 378" width="538px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1aatzq9mmuiek" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f14nc2la0928ij" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1aatzq9mmuiek)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/>
       <ellipse cx="23.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,302.1406 Q26.0906,302.4375 25.45,302.5781 Q24.8094,302.7344 24.1063,302.7344 Q21.6063,302.7344 20.2781,301.0938 Q18.9656,299.4375 18.9656,296.3125 Q18.9656,293.1875 20.2781,291.5313 Q21.6063,289.875 24.1063,289.875 Q24.8094,289.875 25.45,290.0313 Q26.1063,290.1875 26.6688,290.4844 L26.6688,293.2031 Q26.0438,292.625 25.45,292.3594 Q24.8563,292.0781 24.2313,292.0781 Q22.8875,292.0781 22.2,293.1563 Q21.5125,294.2188 21.5125,296.3125 Q21.5125,298.4063 22.2,299.4844 Q22.8875,300.5469 24.2313,300.5469 Q24.8563,300.5469 25.45,300.2813 Q26.0438,300 26.6688,299.4219 L26.6688,302.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="300.6543">Target1</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="344.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="347.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1aatzq9mmuiek)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="440" y="280.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="440" y="280.5"/>
       <ellipse cx="457.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M460.6688,302.1406 Q460.0906,302.4375 459.45,302.5781 Q458.8094,302.7344 458.1063,302.7344 Q455.6063,302.7344 454.2781,301.0938 Q452.9656,299.4375 452.9656,296.3125 Q452.9656,293.1875 454.2781,291.5313 Q455.6063,289.875 458.1063,289.875 Q458.8094,289.875 459.45,290.0313 Q460.1063,290.1875 460.6688,290.4844 L460.6688,293.2031 Q460.0438,292.625 459.45,292.3594 Q458.8563,292.0781 458.2313,292.0781 Q456.8875,292.0781 456.2,293.1563 Q455.5125,294.2188 455.5125,296.3125 Q455.5125,298.4063 456.2,299.4844 Q456.8875,300.5469 458.2313,300.5469 Q458.8563,300.5469 459.45,300.2813 Q460.0438,300 460.6688,299.4219 L460.6688,302.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="472.3" y="300.6543">Target2</text>
@@ -33,8 +33,8 @@
       <ellipse cx="451" cy="344.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="460" y="347.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1aatzq9mmuiek)" height="99.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="128.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="99.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="128.5" y="268"/>
       <ellipse cx="240.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M243.2188,289.6406 Q242.6406,289.9375 242,290.0781 Q241.3594,290.2344 240.6563,290.2344 Q238.1563,290.2344 236.8281,288.5938 Q235.5156,286.9375 235.5156,283.8125 Q235.5156,280.6875 236.8281,279.0313 Q238.1563,277.375 240.6563,277.375 Q241.3594,277.375 242,277.5313 Q242.6563,277.6875 243.2188,277.9844 L243.2188,280.7031 Q242.5938,280.125 242,279.8594 Q241.4063,279.5781 240.7813,279.5781 Q239.4375,279.5781 238.75,280.6563 Q238.0625,281.7188 238.0625,283.8125 Q238.0625,285.9063 238.75,286.9844 Q239.4375,288.0469 240.7813,288.0469 Q241.4063,288.0469 242,287.7813 Q242.5938,287.5 243.2188,286.9219 L243.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="260.75" y="288.1543">Proxy</text>
@@ -42,11 +42,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="399.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="403.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134.5" y="306"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136.5" y="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148.5" y="314.2104">m_target : std::shared_ptr&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="403.5" y1="320.8047" y2="320.8047"/>
@@ -56,7 +56,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148.5" y="347.8198">m1() : void</text>
     <ellipse cx="139.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148.5" y="360.6245">m2() : void</text>
-    <rect fill="#FEFECE" filter="url(#f1aatzq9mmuiek)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="131.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="131.5" y="159"/>
     <ellipse cx="146.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M149.4688,180.6406 Q148.8906,180.9375 148.25,181.0781 Q147.6094,181.2344 146.9063,181.2344 Q144.4063,181.2344 143.0781,179.5938 Q141.7656,177.9375 141.7656,174.8125 Q141.7656,171.6875 143.0781,170.0313 Q144.4063,168.375 146.9063,168.375 Q147.6094,168.375 148.25,168.5313 Q148.9063,168.6875 149.4688,168.9844 L149.4688,171.7031 Q148.8438,171.125 148.25,170.8594 Q147.6563,170.5781 147.0313,170.5781 Q145.6875,170.5781 145,171.6563 Q144.3125,172.7188 144.3125,174.8125 Q144.3125,176.9063 145,177.9844 Q145.6875,179.0469 147.0313,179.0469 Q147.6563,179.0469 148.25,178.7813 Q148.8438,178.5 149.4688,177.9219 L149.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="160.5" y="179.1543">Proxy</text>
@@ -64,7 +64,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="202.5" y="168.1387">Target1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="248.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="248.5" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#f1aatzq9mmuiek)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="284.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="284.5" y="159"/>
     <ellipse cx="299.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M302.4688,180.6406 Q301.8906,180.9375 301.25,181.0781 Q300.6094,181.2344 299.9063,181.2344 Q297.4063,181.2344 296.0781,179.5938 Q294.7656,177.9375 294.7656,174.8125 Q294.7656,171.6875 296.0781,170.0313 Q297.4063,168.375 299.9063,168.375 Q300.6094,168.375 301.25,168.5313 Q301.9063,168.6875 302.4688,168.9844 L302.4688,171.7031 Q301.8438,171.125 301.25,170.8594 Q300.6563,170.5781 300.0313,170.5781 Q298.6875,170.5781 298,171.6563 Q297.3125,172.7188 297.3125,174.8125 Q297.3125,176.9063 298,177.9844 Q298.6875,179.0469 300.0313,179.0469 Q300.6563,179.0469 301.25,178.7813 Q301.8438,178.5 302.4688,177.9219 L302.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="313.5" y="179.1543">Proxy</text>
@@ -72,25 +72,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="355.5" y="168.1387">Target2</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="401.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="401.5" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1aatzq9mmuiek)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="182" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="182" y="8"/>
       <ellipse cx="225.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M228.3188,29.6406 Q227.7406,29.9375 227.1,30.0781 Q226.4594,30.2344 225.7563,30.2344 Q223.2563,30.2344 221.9281,28.5938 Q220.6156,26.9375 220.6156,23.8125 Q220.6156,20.6875 221.9281,19.0313 Q223.2563,17.375 225.7563,17.375 Q226.4594,17.375 227.1,17.5313 Q227.7563,17.6875 228.3188,17.9844 L228.3188,20.7031 Q227.6938,20.125 227.1,19.8594 Q226.5063,19.5781 225.8813,19.5781 Q224.5375,19.5781 223.85,20.6563 Q223.1625,21.7188 223.1625,23.8125 Q223.1625,25.9063 223.85,26.9844 Q224.5375,28.0469 225.8813,28.0469 Q226.5063,28.0469 227.1,27.7813 Q227.6938,27.5 228.3188,26.9219 L228.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="245.65" y="28.1543">ProxyHolder</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="350" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="188" y="46"/>
       <ellipse cx="193" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="202" y="54.2104">proxy1 : Proxy&lt;Target1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="188" y="58.8047"/>
       <ellipse cx="193" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="202" y="67.0151">proxy2 : Proxy&lt;Target2&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="350" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index 759624f2..8c6f2ba8 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="567px" preserveAspectRatio="none" style="width:690px;height:567px;" version="1.1" viewBox="0 0 690 567" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jskmcm6p13o9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1dhefjal8smim" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jskmcm6p13o9)" height="86.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="165.5" y="470"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="86.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="165.5" y="470"/>
       <ellipse cx="220.25" cy="486" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.2188,491.6406 Q222.6406,491.9375 222,492.0781 Q221.3594,492.2344 220.6563,492.2344 Q218.1563,492.2344 216.8281,490.5938 Q215.5156,488.9375 215.5156,485.8125 Q215.5156,482.6875 216.8281,481.0313 Q218.1563,479.375 220.6563,479.375 Q221.3594,479.375 222,479.5313 Q222.6563,479.6875 223.2188,479.9844 L223.2188,482.7031 Q222.5938,482.125 222,481.8594 Q221.4063,481.5781 220.7813,481.5781 Q219.4375,481.5781 218.75,482.6563 Q218.0625,483.7188 218.0625,485.8125 Q218.0625,487.9063 218.75,488.9844 Q219.4375,490.0469 220.7813,490.0469 Q221.4063,490.0469 222,489.7813 Q222.5938,489.5 223.2188,488.9219 L223.2188,491.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="240.75" y="490.1543">Memento</text>
@@ -18,11 +18,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="347.5" y="479.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="166.5" x2="351.5" y1="502" y2="502"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="171.5" y="508"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="173.5" y="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="185.5" y="516.2104">m_value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="166.5" x2="351.5" y1="522.8047" y2="522.8047"/>
@@ -30,8 +30,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="185.5" y="537.0151">Memento&lt;T&gt;(T &amp;&amp; v) : void</text>
     <ellipse cx="176.5" cy="546.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="185.5" y="549.8198">value() const : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jskmcm6p13o9)" height="124.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="124.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
       <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
@@ -39,11 +39,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="671.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="314.2104">m_value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
@@ -57,8 +57,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="373.4292">print() const : void</text>
     <ellipse cx="442.5" cy="383.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="386.2339">set(T &amp;&amp; v) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jskmcm6p13o9)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/>
       <ellipse cx="160.25" cy="303.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.2188,309.1406 Q162.6406,309.4375 162,309.5781 Q161.3594,309.7344 160.6563,309.7344 Q158.1563,309.7344 156.8281,308.0938 Q155.5156,306.4375 155.5156,303.3125 Q155.5156,300.1875 156.8281,298.5313 Q158.1563,296.875 160.6563,296.875 Q161.3594,296.875 162,297.0313 Q162.6563,297.1875 163.2188,297.4844 L163.2188,300.2031 Q162.5938,299.625 162,299.3594 Q161.4063,299.0781 160.7813,299.0781 Q159.4375,299.0781 158.75,300.1563 Q158.0625,301.2188 158.0625,303.3125 Q158.0625,305.4063 158.75,306.4844 Q159.4375,307.5469 160.7813,307.5469 Q161.4063,307.5469 162,307.2813 Q162.5938,307 163.2188,306.4219 L163.2188,309.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="307.6543">Caretaker</text>
@@ -66,11 +66,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="296.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="319.5" y2="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="325.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="327.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="333.7104">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="340.3047" y2="340.3047"/>
@@ -78,7 +78,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="354.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
     <ellipse cx="17" cy="364.1094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="367.3198">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
-    <rect fill="#FEFECE" filter="url(#f1jskmcm6p13o9)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+    <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
     <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
@@ -86,7 +86,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="339" y="168.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#f1jskmcm6p13o9)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+    <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
     <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
@@ -94,25 +94,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="554" y="168.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jskmcm6p13o9)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
       <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="46"/>
       <ellipse cx="313.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="54.2104">caretaker : Caretaker&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="58.8047"/>
       <ellipse cx="313.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="67.0151">originator : Originator&lt;std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index d191d1ef..a2e8792b 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1274px;height:390px;" version="1.1" viewBox="0 0 1274 390" width="1274px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2ufzjk73kprr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1a42wrhf09rqe" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="73.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="402.5" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="73.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="402.5" y="184"/>
       <ellipse cx="463.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M463.3594,195.3438 L462.2031,200.4219 L464.5313,200.4219 L463.3594,195.3438 Z M461.875,193.1094 L464.8594,193.1094 L468.2188,205.5 L465.7656,205.5 L465,202.4375 L461.7188,202.4375 L460.9688,205.5 L458.5313,205.5 L461.875,193.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="483.75" y="204.1543">Shape</text>
@@ -21,14 +21,14 @@
       <ellipse cx="413.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="144" x="422.5" y="251.0151">~Shape() = default : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="134" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="134" y="197"/>
     <ellipse cx="149" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M151.9688,218.6406 Q151.3906,218.9375 150.75,219.0781 Q150.1094,219.2344 149.4063,219.2344 Q146.9063,219.2344 145.5781,217.5938 Q144.2656,215.9375 144.2656,212.8125 Q144.2656,209.6875 145.5781,208.0313 Q146.9063,206.375 149.4063,206.375 Q150.1094,206.375 150.75,206.5313 Q151.4063,206.6875 151.9688,206.9844 L151.9688,209.7031 Q151.3438,209.125 150.75,208.8594 Q150.1563,208.5781 149.5313,208.5781 Q148.1875,208.5781 147.5,209.6563 Q146.8125,210.7188 146.8125,212.8125 Q146.8125,214.9063 147.5,215.9844 Q148.1875,217.0469 149.5313,217.0469 Q150.1563,217.0469 150.75,216.7813 Q151.3438,216.5 151.9688,215.9219 L151.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="217.1543">Line</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="190" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="190" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="142" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="142" y="319"/>
       <ellipse cx="161.05" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M164.0188,340.6406 Q163.4406,340.9375 162.8,341.0781 Q162.1594,341.2344 161.4563,341.2344 Q158.9563,341.2344 157.6281,339.5938 Q156.3156,337.9375 156.3156,334.8125 Q156.3156,331.6875 157.6281,330.0313 Q158.9563,328.375 161.4563,328.375 Q162.1594,328.375 162.8,328.5313 Q163.4563,328.6875 164.0188,328.9844 L164.0188,331.7031 Q163.3938,331.125 162.8,330.8594 Q162.2063,330.5781 161.5813,330.5781 Q160.2375,330.5781 159.55,331.6563 Q158.8625,332.7188 158.8625,334.8125 Q158.8625,336.9063 159.55,337.9844 Q160.2375,339.0469 161.5813,339.0469 Q162.2063,339.0469 162.8,338.7813 Q163.3938,338.5 164.0188,337.9219 L164.0188,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="175.95" y="339.1543">Line</text>
@@ -39,14 +39,14 @@
       <ellipse cx="153" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="162" y="373.2104">display() : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="913.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="913.5" y="197"/>
     <ellipse cx="928.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M931.4688,218.6406 Q930.8906,218.9375 930.25,219.0781 Q929.6094,219.2344 928.9063,219.2344 Q926.4063,219.2344 925.0781,217.5938 Q923.7656,215.9375 923.7656,212.8125 Q923.7656,209.6875 925.0781,208.0313 Q926.4063,206.375 928.9063,206.375 Q929.6094,206.375 930.25,206.5313 Q930.9063,206.6875 931.4688,206.9844 L931.4688,209.7031 Q930.8438,209.125 930.25,208.8594 Q929.6563,208.5781 929.0313,208.5781 Q927.6875,208.5781 927,209.6563 Q926.3125,210.7188 926.3125,212.8125 Q926.3125,214.9063 927,215.9844 Q927.6875,217.0469 929.0313,217.0469 Q929.6563,217.0469 930.25,216.7813 Q930.8438,216.5 931.4688,215.9219 L931.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="942.5" y="217.1543">Text</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="914.5" x2="970.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="914.5" x2="970.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="696" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="696" y="319"/>
       <ellipse cx="714.6" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M717.5688,340.6406 Q716.9906,340.9375 716.35,341.0781 Q715.7094,341.2344 715.0063,341.2344 Q712.5063,341.2344 711.1781,339.5938 Q709.8656,337.9375 709.8656,334.8125 Q709.8656,331.6875 711.1781,330.0313 Q712.5063,328.375 715.0063,328.375 Q715.7094,328.375 716.35,328.5313 Q717.0063,328.6875 717.5688,328.9844 L717.5688,331.7031 Q716.9438,331.125 716.35,330.8594 Q715.7563,330.5781 715.1313,330.5781 Q713.7875,330.5781 713.1,331.6563 Q712.4125,332.7188 712.4125,334.8125 Q712.4125,336.9063 713.1,337.9844 Q713.7875,339.0469 715.1313,339.0469 Q715.7563,339.0469 716.35,338.7813 Q716.9438,338.5 717.5688,337.9219 L717.5688,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="729.4" y="339.1543">Text</text>
@@ -57,8 +57,8 @@
       <ellipse cx="707" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="716" y="373.2104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1066" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1066" y="27"/>
       <ellipse cx="1081" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1081.1094,38.3438 L1079.9531,43.4219 L1082.2813,43.4219 L1081.1094,38.3438 Z M1079.625,36.1094 L1082.6094,36.1094 L1085.9688,48.5 L1083.5156,48.5 L1082.75,45.4375 L1079.4688,45.4375 L1078.7188,48.5 L1076.2813,48.5 L1079.625,36.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1095" y="47.1543">ShapeDecorator</text>
@@ -67,8 +67,8 @@
       <ellipse cx="1077" cy="78" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1086" y="81.2104">display() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1007" y="190.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1007" y="190.5"/>
       <ellipse cx="1037.3" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1040.2688,212.1406 Q1039.6906,212.4375 1039.05,212.5781 Q1038.4094,212.7344 1037.7063,212.7344 Q1035.2063,212.7344 1033.8781,211.0938 Q1032.5656,209.4375 1032.5656,206.3125 Q1032.5656,203.1875 1033.8781,201.5313 Q1035.2063,199.875 1037.7063,199.875 Q1038.4094,199.875 1039.05,200.0313 Q1039.7063,200.1875 1040.2688,200.4844 L1040.2688,203.2031 Q1039.6438,202.625 1039.05,202.3594 Q1038.4563,202.0781 1037.8313,202.0781 Q1036.4875,202.0781 1035.8,203.1563 Q1035.1125,204.2188 1035.1125,206.3125 Q1035.1125,208.4063 1035.8,209.4844 Q1036.4875,210.5469 1037.8313,210.5469 Q1038.4563,210.5469 1039.05,210.2813 Q1039.6438,210 1040.2688,209.4219 L1040.2688,212.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1054.7" y="210.6543">Color</text>
@@ -79,8 +79,8 @@
       <ellipse cx="1018" cy="241.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1027" y="244.7104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1151" y="190.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1151" y="190.5"/>
       <ellipse cx="1176.35" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1179.3188,212.1406 Q1178.7406,212.4375 1178.1,212.5781 Q1177.4594,212.7344 1176.7563,212.7344 Q1174.2563,212.7344 1172.9281,211.0938 Q1171.6156,209.4375 1171.6156,206.3125 Q1171.6156,203.1875 1172.9281,201.5313 Q1174.2563,199.875 1176.7563,199.875 Q1177.4594,199.875 1178.1,200.0313 Q1178.7563,200.1875 1179.3188,200.4844 L1179.3188,203.2031 Q1178.6938,202.625 1178.1,202.3594 Q1177.5063,202.0781 1176.8813,202.0781 Q1175.5375,202.0781 1174.85,203.1563 Q1174.1625,204.2188 1174.1625,206.3125 Q1174.1625,208.4063 1174.85,209.4844 Q1175.5375,210.5469 1176.8813,210.5469 Q1177.5063,210.5469 1178.1,210.2813 Q1178.6938,210 1179.3188,209.4219 L1179.3188,212.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1192.65" y="210.6543">Weight</text>
@@ -91,7 +91,7 @@
       <ellipse cx="1162" cy="241.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1171" y="244.7104">display() : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="226" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="226" y="197"/>
     <ellipse cx="241" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M243.9688,218.6406 Q243.3906,218.9375 242.75,219.0781 Q242.1094,219.2344 241.4063,219.2344 Q238.9063,219.2344 237.5781,217.5938 Q236.2656,215.9375 236.2656,212.8125 Q236.2656,209.6875 237.5781,208.0313 Q238.9063,206.375 241.4063,206.375 Q242.1094,206.375 242.75,206.5313 Q243.4063,206.6875 243.9688,206.9844 L243.9688,209.7031 Q243.3438,209.125 242.75,208.8594 Q242.1563,208.5781 241.5313,208.5781 Q240.1875,208.5781 239.5,209.6563 Q238.8125,210.7188 238.8125,212.8125 Q238.8125,214.9063 239.5,215.9844 Q240.1875,217.0469 241.5313,217.0469 Q242.1563,217.0469 242.75,216.7813 Q243.3438,216.5 243.9688,215.9219 L243.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="255" y="217.1543">Line</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="289" y="206.1387">Color,Weight</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="227" x2="366" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="227" x2="366" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="197"/>
     <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="217.1543">Line</text>
@@ -107,7 +107,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="206.1387">Color</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="607.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="607.5" y="197"/>
     <ellipse cx="622.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M625.4688,218.6406 Q624.8906,218.9375 624.25,219.0781 Q623.6094,219.2344 622.9063,219.2344 Q620.4063,219.2344 619.0781,217.5938 Q617.7656,215.9375 617.7656,212.8125 Q617.7656,209.6875 619.0781,208.0313 Q620.4063,206.375 622.9063,206.375 Q623.6094,206.375 624.25,206.5313 Q624.9063,206.6875 625.4688,206.9844 L625.4688,209.7031 Q624.8438,209.125 624.25,208.8594 Q623.6563,208.5781 623.0313,208.5781 Q621.6875,208.5781 621,209.6563 Q620.3125,210.7188 620.3125,212.8125 Q620.3125,214.9063 621,215.9844 Q621.6875,217.0469 623.0313,217.0469 Q623.6563,217.0469 624.25,216.7813 Q624.8438,216.5 625.4688,215.9219 L625.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="636.5" y="217.1543">Text</text>
@@ -115,7 +115,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="671.5" y="206.1387">Color,Weight</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="608.5" x2="748.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="608.5" x2="748.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="784.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="784.5" y="197"/>
     <ellipse cx="799.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M802.4688,218.6406 Q801.8906,218.9375 801.25,219.0781 Q800.6094,219.2344 799.9063,219.2344 Q797.4063,219.2344 796.0781,217.5938 Q794.7656,215.9375 794.7656,212.8125 Q794.7656,209.6875 796.0781,208.0313 Q797.4063,206.375 799.9063,206.375 Q800.6094,206.375 801.25,206.5313 Q801.9063,206.6875 802.4688,206.9844 L802.4688,209.7031 Q801.8438,209.125 801.25,208.8594 Q800.6563,208.5781 800.0313,208.5781 Q798.6875,208.5781 798,209.6563 Q797.3125,210.7188 797.3125,212.8125 Q797.3125,214.9063 798,215.9844 Q798.6875,217.0469 800.0313,217.0469 Q800.6563,217.0469 801.25,216.7813 Q801.8438,216.5 802.4688,215.9219 L802.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="813.5" y="217.1543">Text</text>
@@ -123,39 +123,39 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="848.5" y="206.1387">Color</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="785.5" x2="877.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="785.5" x2="877.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f2ufzjk73kprr)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="428.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="428.5" y="8"/>
       <ellipse cx="494.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M497.7188,29.6406 Q497.1406,29.9375 496.5,30.0781 Q495.8594,30.2344 495.1563,30.2344 Q492.6563,30.2344 491.3281,28.5938 Q490.0156,26.9375 490.0156,23.8125 Q490.0156,20.6875 491.3281,19.0313 Q492.6563,17.375 495.1563,17.375 Q495.8594,17.375 496.5,17.5313 Q497.1563,17.6875 497.7188,17.9844 L497.7188,20.7031 Q497.0938,20.125 496.5,19.8594 Q495.9063,19.5781 495.2813,19.5781 Q493.9375,19.5781 493.25,20.6563 Q492.5625,21.7188 492.5625,23.8125 Q492.5625,25.9063 493.25,26.9844 Q493.9375,28.0469 495.2813,28.0469 Q495.9063,28.0469 496.5,27.7813 Q497.0938,27.5 497.7188,26.9219 L497.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="515.25" y="28.1543">Window</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="429.5" x2="615.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="46"/>
       <ellipse cx="439.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="448.5" y="54.2104">border : Line&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="58.8047"/>
       <ellipse cx="439.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="448.5" y="67.0151">divider : Line&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="71.6094"/>
       <ellipse cx="439.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="448.5" y="79.8198">title : Text&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="84.4141"/>
       <ellipse cx="439.5" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="448.5" y="92.6245">description : Text&lt;Color&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="429.5" x2="615.5" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index f363a267..cd71efac 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="410px" preserveAspectRatio="none" style="width:877px;height:410px;" version="1.1" viewBox="0 0 877 410" width="877px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16qa5hufg7ass" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1mwm3qmwhfxb3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,54 +9,54 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="95" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="95" y="226.5"/>
       <ellipse cx="110" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,248.1406 Q112.3906,248.4375 111.75,248.5781 Q111.1094,248.7344 110.4063,248.7344 Q107.9063,248.7344 106.5781,247.0938 Q105.2656,245.4375 105.2656,242.3125 Q105.2656,239.1875 106.5781,237.5313 Q107.9063,235.875 110.4063,235.875 Q111.1094,235.875 111.75,236.0313 Q112.4063,236.1875 112.9688,236.4844 L112.9688,239.2031 Q112.3438,238.625 111.75,238.3594 Q111.1563,238.0781 110.5313,238.0781 Q109.1875,238.0781 108.5,239.1563 Q107.8125,240.2188 107.8125,242.3125 Q107.8125,244.4063 108.5,245.4844 Q109.1875,246.5469 110.5313,246.5469 Q111.1563,246.5469 111.75,246.2813 Q112.3438,246 112.9688,245.4219 L112.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="124" y="246.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="134" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="134" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M12.5,64.5 L12.5,89.6328 L115.5,89.6328 L115.5,74.5 L105.5,64.5 L12.5,64.5 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M12.5,64.5 L12.5,89.6328 L115.5,89.6328 L115.5,74.5 L105.5,64.5 L12.5,64.5 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105.5,64.5 L105.5,74.5 L115.5,74.5 L105.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="18.5" y="81.5669">A class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="684" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="684" y="226.5"/>
       <ellipse cx="699" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M701.9688,248.1406 Q701.3906,248.4375 700.75,248.5781 Q700.1094,248.7344 699.4063,248.7344 Q696.9063,248.7344 695.5781,247.0938 Q694.2656,245.4375 694.2656,242.3125 Q694.2656,239.1875 695.5781,237.5313 Q696.9063,235.875 699.4063,235.875 Q700.1094,235.875 700.75,236.0313 Q701.4063,236.1875 701.9688,236.4844 L701.9688,239.2031 Q701.3438,238.625 700.75,238.3594 Q700.1563,238.0781 699.5313,238.0781 Q698.1875,238.0781 697.5,239.1563 Q696.8125,240.2188 696.8125,242.3125 Q696.8125,244.4063 697.5,245.4844 Q698.1875,246.5469 699.5313,246.5469 Q700.1563,246.5469 700.75,246.2813 Q701.3438,246 701.9688,245.4219 L701.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713" y="246.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="685" x2="723" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="685" x2="723" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M545.5,238 L545.5,263.1328 A0,0 0 0 0 545.5,263.1328 L648.5,263.1328 A0,0 0 0 0 648.5,263.1328 L648.5,256 L683.74,250.5 L648.5,248 L648.5,248 L638.5,238 L545.5,238 A0,0 0 0 0 545.5,238 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M545.5,238 L545.5,263.1328 A0,0 0 0 0 545.5,263.1328 L648.5,263.1328 A0,0 0 0 0 648.5,263.1328 L648.5,256 L683.74,250.5 L648.5,248 L648.5,248 L638.5,238 L545.5,238 A0,0 0 0 0 545.5,238 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M638.5,238 L638.5,248 L648.5,248 L638.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="551.5" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="247" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="247" y="226.5"/>
       <ellipse cx="262" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M264.9688,248.1406 Q264.3906,248.4375 263.75,248.5781 Q263.1094,248.7344 262.4063,248.7344 Q259.9063,248.7344 258.5781,247.0938 Q257.2656,245.4375 257.2656,242.3125 Q257.2656,239.1875 258.5781,237.5313 Q259.9063,235.875 262.4063,235.875 Q263.1094,235.875 263.75,236.0313 Q264.4063,236.1875 264.9688,236.4844 L264.9688,239.2031 Q264.3438,238.625 263.75,238.3594 Q263.1563,238.0781 262.5313,238.0781 Q261.1875,238.0781 260.5,239.1563 Q259.8125,240.2188 259.8125,242.3125 Q259.8125,244.4063 260.5,245.4844 Q261.1875,246.5469 262.5313,246.5469 Q263.1563,246.5469 263.75,246.2813 Q264.3438,246 264.9688,245.4219 L264.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="276" y="246.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="248" x2="286" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="248" x2="286" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M158.5,357 L158.5,382.1328 A0,0 0 0 0 158.5,382.1328 L261.5,382.1328 A0,0 0 0 0 261.5,382.1328 L261.5,367 L251.5,357 L219.68,357 L255.74,274.62 L211.68,357 L158.5,357 A0,0 0 0 0 158.5,357 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M158.5,357 L158.5,382.1328 A0,0 0 0 0 158.5,382.1328 L261.5,382.1328 A0,0 0 0 0 261.5,382.1328 L261.5,367 L251.5,357 L219.68,357 L255.74,274.62 L211.68,357 L158.5,357 A0,0 0 0 0 158.5,357 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M251.5,357 L251.5,367 L261.5,367 L251.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164.5" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L25" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="170.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L25" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="170.5" y="226.5"/>
       <ellipse cx="185.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.4688,248.1406 Q187.8906,248.4375 187.25,248.5781 Q186.6094,248.7344 185.9063,248.7344 Q183.4063,248.7344 182.0781,247.0938 Q180.7656,245.4375 180.7656,242.3125 Q180.7656,239.1875 182.0781,237.5313 Q183.4063,235.875 185.9063,235.875 Q186.6094,235.875 187.25,236.0313 Q187.9063,236.1875 188.4688,236.4844 L188.4688,239.2031 Q187.8438,238.625 187.25,238.3594 Q186.6563,238.0781 186.0313,238.0781 Q184.6875,238.0781 184,239.1563 Q183.3125,240.2188 183.3125,242.3125 Q183.3125,244.4063 184,245.4844 Q184.6875,246.5469 186.0313,246.5469 Q186.6563,246.5469 187.25,246.2813 Q187.8438,246 188.4688,245.4219 L188.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.5" y="246.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171.5" x2="210.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171.5" x2="210.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M6,223 L6,278.3984 L60,278.3984 L60,233 L50,223 L6,223 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,223 L6,278.3984 L60,278.3984 L60,233 L50,223 L6,223 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M50,223 L50,233 L60,233 L50,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="12" y="240.0669">D</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="12" y="255.1997">class</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="12" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="496" y="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="496" y="339"/>
       <ellipse cx="524.95" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.9188,360.6406 Q527.3406,360.9375 526.7,361.0781 Q526.0594,361.2344 525.3563,361.2344 Q522.8563,361.2344 521.5281,359.5938 Q520.2156,357.9375 520.2156,354.8125 Q520.2156,351.6875 521.5281,350.0313 Q522.8563,348.375 525.3563,348.375 Q526.0594,348.375 526.7,348.5313 Q527.3563,348.6875 527.9188,348.9844 L527.9188,351.7031 Q527.2938,351.125 526.7,350.8594 Q526.1063,350.5781 525.4813,350.5781 Q524.1375,350.5781 523.45,351.6563 Q522.7625,352.7188 522.7625,354.8125 Q522.7625,356.9063 523.45,357.9844 Q524.1375,359.0469 525.4813,359.0469 Q526.1063,359.0469 526.7,358.7813 Q527.2938,358.5 527.9188,357.9219 L527.9188,360.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.05" y="359.1543">E</text>
@@ -64,27 +64,27 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="573" y="348.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="577" y1="371" y2="371"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502" y="377"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="504" y="379"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="516" y="385.2104">param : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="577" y1="391.8047" y2="391.8047"/>
-    <path d="M297,357 L297,382.1328 A0,0 0 0 0 297,382.1328 L461,382.1328 A0,0 0 0 0 461,382.1328 L461,375 L495.78,369.5 L461,367 L461,367 L451,357 L297,357 A0,0 0 0 0 297,357 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M297,357 L297,382.1328 A0,0 0 0 0 297,382.1328 L461,382.1328 A0,0 0 0 0 461,382.1328 L461,375 L495.78,369.5 L461,367 L461,367 L451,357 L297,357 A0,0 0 0 0 297,357 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M451,357 L451,367 L461,367 L451,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="303" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="373.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="373.5" y="226.5"/>
       <ellipse cx="388.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.4688,248.1406 Q390.8906,248.4375 390.25,248.5781 Q389.6094,248.7344 388.9063,248.7344 Q386.4063,248.7344 385.0781,247.0938 Q383.7656,245.4375 383.7656,242.3125 Q383.7656,239.1875 385.0781,237.5313 Q386.4063,235.875 388.9063,235.875 Q389.6094,235.875 390.25,236.0313 Q390.9063,236.1875 391.4688,236.4844 L391.4688,239.2031 Q390.8438,238.625 390.25,238.3594 Q389.6563,238.0781 389.0313,238.0781 Q387.6875,238.0781 387,239.1563 Q386.3125,240.2188 386.3125,242.3125 Q386.3125,244.4063 387,245.4844 Q387.6875,246.5469 389.0313,246.5469 Q389.6563,246.5469 390.25,246.2813 Q390.8438,246 391.4688,245.4219 L391.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="402.5" y="246.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="413.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="413.5" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L38" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L38" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="791" y="34"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L38" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L38" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="791" y="34"/>
       <ellipse cx="807.35" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M811.4594,56 L803.7406,56 L803.7406,43.6094 L811.4594,43.6094 L811.4594,45.7656 L806.1938,45.7656 L806.1938,48.4375 L810.9594,48.4375 L810.9594,50.5938 L806.1938,50.5938 L806.1938,53.8438 L811.4594,53.8438 L811.4594,56 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="821.65" y="54.1543">F</text>
@@ -94,10 +94,10 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="797" y="105.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792" x2="832" y1="112.4141" y2="112.4141"/>
     </a>
-    <path d="M759,238 L759,263.1328 A0,0 0 0 0 759,263.1328 L865,263.1328 A0,0 0 0 0 865,263.1328 L865,248 L855,238 L816,238 L812,120.39 L808,238 L759,238 A0,0 0 0 0 759,238 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M759,238 L759,263.1328 A0,0 0 0 0 759,263.1328 L865,263.1328 A0,0 0 0 0 865,263.1328 L865,248 L855,238 L816,238 L812,120.39 L808,238 L759,238 A0,0 0 0 0 759,238 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M855,238 L855,248 L865,248 L855,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="765" y="255.0669">F enum note.</text>
-    <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="450" y="226.5"/>
+    <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="450" y="226.5"/>
     <ellipse cx="465" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M467.9688,248.1406 Q467.3906,248.4375 466.75,248.5781 Q466.1094,248.7344 465.4063,248.7344 Q462.9063,248.7344 461.5781,247.0938 Q460.2656,245.4375 460.2656,242.3125 Q460.2656,239.1875 461.5781,237.5313 Q462.9063,235.875 465.4063,235.875 Q466.1094,235.875 466.75,236.0313 Q467.4063,236.1875 467.9688,236.4844 L467.9688,239.2031 Q467.3438,238.625 466.75,238.3594 Q466.1563,238.0781 465.5313,238.0781 Q464.1875,238.0781 463.5,239.1563 Q462.8125,240.2188 462.8125,242.3125 Q462.8125,244.4063 463.5,245.4844 Q464.1875,246.5469 465.5313,246.5469 Q466.1563,246.5469 466.75,246.2813 Q467.3438,246 467.9688,245.4219 L467.9688,248.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479" y="246.6543">E</text>
@@ -105,63 +105,63 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="496" y="235.6387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="509" y1="258.5" y2="258.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="509" y1="266.5" y2="266.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L41" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L41" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16qa5hufg7ass)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="193" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L41" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L41" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="193" y="8"/>
       <ellipse cx="310.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.7188,29.6406 Q313.1406,29.9375 312.5,30.0781 Q311.8594,30.2344 311.1563,30.2344 Q308.6563,30.2344 307.3281,28.5938 Q306.0156,26.9375 306.0156,23.8125 Q306.0156,20.6875 307.3281,19.0313 Q308.6563,17.375 311.1563,17.375 Q311.8594,17.375 312.5,17.5313 Q313.1563,17.6875 313.7188,17.9844 L313.7188,20.7031 Q313.0938,20.125 312.5,19.8594 Q311.9063,19.5781 311.2813,19.5781 Q309.9375,19.5781 309.25,20.6563 Q308.5625,21.7188 308.5625,23.8125 Q308.5625,25.9063 309.25,26.9844 Q309.9375,28.0469 311.2813,28.0469 Q311.9063,28.0469 312.5,27.7813 Q313.0938,27.5 313.7188,26.9219 L313.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="331.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="194" x2="444" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="213" y="54.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="213" y="67.0151">bbb : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="213" y="79.8198">ccc : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="213" y="92.6245">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="97.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="99.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="213" y="105.4292">eee : E&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="110.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="112.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="213" y="118.2339">ggg : G **</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="194" x2="444" y1="124.8281" y2="124.8281"/>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="132.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="213" y="139.0386">R(C &amp; c) : void</text>
-    <path d="M480,64.5 L480,73 L445.29,77 L480,81 L480,89.6328 A0,0 0 0 0 480,89.6328 L582,89.6328 A0,0 0 0 0 582,89.6328 L582,74.5 L572,64.5 L480,64.5 A0,0 0 0 0 480,64.5 " fill="#FBFB77" filter="url(#f16qa5hufg7ass)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M480,64.5 L480,73 L445.29,77 L480,81 L480,89.6328 A0,0 0 0 0 480,89.6328 L582,89.6328 A0,0 0 0 0 582,89.6328 L582,74.5 L572,64.5 L480,64.5 A0,0 0 0 0 480,64.5 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M572,64.5 L572,74.5 L582,74.5 L572,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="486" y="81.5669">R class note.</text>
-    <path d="M65.13,89.71 C67.4,110.82 73.43,156.48 86,193 C89.91,204.36 95.75,216.29 101.17,226.25 " fill="none" id="GMN444-C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M50.47,222.82 C61.22,208.48 76.4,192.37 94.5,184.5 C110.8,177.41 118.35,177.07 134.5,184.5 C153.13,193.08 167.92,211.17 177.68,226.24 " fill="none" id="GMN456-C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M65.13,89.71 C67.4,110.82 73.43,156.48 86,193 C89.91,204.36 95.75,216.29 101.17,226.25 " fill="none" id="GMN450-C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M50.47,222.82 C61.22,208.48 76.4,192.37 94.5,184.5 C110.8,177.41 118.35,177.07 134.5,184.5 C153.13,193.08 167.92,211.17 177.68,226.24 " fill="none" id="GMN462-C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <path d="M491.26,274.62 C497.66,287.75 505.92,304.71 513.66,320.59 " fill="none" id="C_0001949673179441298667-&gt;C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="none" points="520.05,317.72,522.51,338.76,507.46,323.85,520.05,317.72" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M292.61,146.14 C289.15,156.08 285.84,166.25 283,176 C278.68,190.85 274.93,207.7 272.15,221.51 " fill="none" id="C_0001189142882239313116-&gt;C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index 9684db4d..3b9e52bf 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:464px;height:230px;" version="1.1" viewBox="0 0 464 230" width="464px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f5twzs7qihjz5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcsva8pdvrux9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
       <ellipse cx="25.5" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.4688,48.6406 Q27.8906,48.9375 27.25,49.0781 Q26.6094,49.2344 25.9063,49.2344 Q23.4063,49.2344 22.0781,47.5938 Q20.7656,45.9375 20.7656,42.8125 Q20.7656,39.6875 22.0781,38.0313 Q23.4063,36.375 25.9063,36.375 Q26.6094,36.375 27.25,36.5313 Q27.9063,36.6875 28.4688,36.9844 L28.4688,39.7031 Q27.8438,39.125 27.25,38.8594 Q26.6563,38.5781 26.0313,38.5781 Q24.6875,38.5781 24,39.6563 Q23.3125,40.7188 23.3125,42.8125 Q23.3125,44.9063 24,45.9844 Q24.6875,47.0469 26.0313,47.0469 Q26.6563,47.0469 27.25,46.7813 Q27.8438,46.5 28.4688,45.9219 L28.4688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.5" y="47.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
       <ellipse cx="114.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.4188,42.1406 Q116.8406,42.4375 116.2,42.5781 Q115.5594,42.7344 114.8563,42.7344 Q112.3563,42.7344 111.0281,41.0938 Q109.7156,39.4375 109.7156,36.3125 Q109.7156,33.1875 111.0281,31.5313 Q112.3563,29.875 114.8563,29.875 Q115.5594,29.875 116.2,30.0313 Q116.8563,30.1875 117.4188,30.4844 L117.4188,33.2031 Q116.7938,32.625 116.2,32.3594 Q115.6063,32.0781 114.9813,32.0781 Q113.6375,32.0781 112.95,33.1563 Q112.2625,34.2188 112.2625,36.3125 Q112.2625,38.4063 112.95,39.4844 Q113.6375,40.5469 114.9813,40.5469 Q115.6063,40.5469 116.2,40.2813 Q116.7938,40 117.4188,39.4219 L117.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.55" y="40.6543">C</text>
@@ -26,16 +26,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="162.5" y="29.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="52.5" y2="52.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="91.5" y="58.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="93.5" y="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="105.5" y="66.7104">param : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="73.3047" y2="73.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
       <ellipse cx="218.4" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.5094,30 L214.7906,30 L214.7906,17.6094 L222.5094,17.6094 L222.5094,19.7656 L217.2438,19.7656 L217.2438,22.4375 L222.0094,22.4375 L222.0094,24.5938 L217.2438,24.5938 L217.2438,27.8438 L222.5094,27.8438 L222.5094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="232.6" y="28.1543">E</text>
@@ -45,64 +45,64 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="208.5" y="79.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="243.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L28" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L28" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
       <ellipse cx="315" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M317.9688,192.6406 Q317.3906,192.9375 316.75,193.0781 Q316.1094,193.2344 315.4063,193.2344 Q312.9063,193.2344 311.5781,191.5938 Q310.2656,189.9375 310.2656,186.8125 Q310.2656,183.6875 311.5781,182.0313 Q312.9063,180.375 315.4063,180.375 Q316.1094,180.375 316.75,180.5313 Q317.4063,180.6875 317.9688,180.9844 L317.9688,183.7031 Q317.3438,183.125 316.75,182.8594 Q316.1563,182.5781 315.5313,182.5781 Q314.1875,182.5781 313.5,183.6563 Q312.8125,184.7188 312.8125,186.8125 Q312.8125,188.9063 313.5,189.9844 Q314.1875,191.0469 315.5313,191.0469 Q316.1563,191.0469 316.75,190.7813 Q317.3438,190.5 317.9688,189.9219 L317.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="329" y="191.1543">G1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L31" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L31" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L31" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L31" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="191.1543">G2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L34" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L34" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
       <ellipse cx="105" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,192.6406 Q107.3906,192.9375 106.75,193.0781 Q106.1094,193.2344 105.4063,193.2344 Q102.9063,193.2344 101.5781,191.5938 Q100.2656,189.9375 100.2656,186.8125 Q100.2656,183.6875 101.5781,182.0313 Q102.9063,180.375 105.4063,180.375 Q106.1094,180.375 106.75,180.5313 Q107.4063,180.6875 107.9688,180.9844 L107.9688,183.7031 Q107.3438,183.125 106.75,182.8594 Q106.1563,182.5781 105.5313,182.5781 Q104.1875,182.5781 103.5,183.6563 Q102.8125,184.7188 102.8125,186.8125 Q102.8125,188.9063 103.5,189.9844 Q104.1875,191.0469 105.5313,191.0469 Q106.1563,191.0469 106.75,190.7813 Q107.3438,190.5 107.9688,189.9219 L107.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="119" y="191.1543">G3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L37" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L37" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L37" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L37" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
       <ellipse cx="399" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.9688,192.6406 Q401.3906,192.9375 400.75,193.0781 Q400.1094,193.2344 399.4063,193.2344 Q396.9063,193.2344 395.5781,191.5938 Q394.2656,189.9375 394.2656,186.8125 Q394.2656,183.6875 395.5781,182.0313 Q396.9063,180.375 399.4063,180.375 Q400.1094,180.375 400.75,180.5313 Q401.4063,180.6875 401.9688,180.9844 L401.9688,183.7031 Q401.3438,183.125 400.75,182.8594 Q400.1563,182.5781 399.5313,182.5781 Q398.1875,182.5781 397.5,183.6563 Q396.8125,184.7188 396.8125,186.8125 Q396.8125,188.9063 397.5,189.9844 Q398.1875,191.0469 399.5313,191.0469 Q400.1563,191.0469 400.75,190.7813 Q401.3438,190.5 401.9688,189.9219 L401.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="413" y="191.1543">G4</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L40" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L40" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f5twzs7qihjz5)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L40" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L40" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
       <ellipse cx="358.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.2188,29.6406 Q360.6406,29.9375 360,30.0781 Q359.3594,30.2344 358.6563,30.2344 Q356.1563,30.2344 354.8281,28.5938 Q353.5156,26.9375 353.5156,23.8125 Q353.5156,20.6875 354.8281,19.0313 Q356.1563,17.375 358.6563,17.375 Q359.3594,17.375 360,17.5313 Q360.6563,17.6875 361.2188,17.9844 L361.2188,20.7031 Q360.5938,20.125 360,19.8594 Q359.4063,19.5781 358.7813,19.5781 Q357.4375,19.5781 356.75,20.6563 Q356.0625,21.7188 356.0625,23.8125 Q356.0625,25.9063 356.75,26.9844 Q357.4375,28.0469 358.7813,28.0469 Q359.4063,28.0469 360,27.7813 Q360.5938,27.5 361.2188,26.9219 L361.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="378.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="46"/>
       <ellipse cx="290.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="299.5" y="54.2104">g1 : G1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="58.8047"/>
       <ellipse cx="290.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="299.5" y="67.0151">g3 : G3 &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="71.6094"/>
       <ellipse cx="290.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="299.5" y="79.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index 5d1019a7..21b0b058 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ipztyz7205hr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ftufszwvvs59o" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,86 +9,86 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ipztyz7205hr)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ipztyz7205hr)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
       <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ipztyz7205hr)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
       <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ipztyz7205hr)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
       <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ipztyz7205hr)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
       <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ipztyz7205hr)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
       <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="46"/>
       <ellipse cx="120" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="54.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="58.8047"/>
       <ellipse cx="120" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="67.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="71.6094"/>
       <ellipse cx="120" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="79.8198">ccc : std::vector&lt;C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="84.4141"/>
       <ellipse cx="120" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="92.6245">ddd : D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="97.2188"/>
       <ellipse cx="120" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="105.4292">eee : E *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="112.0234" y2="112.0234"/>
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 25ae7c98..01af0758 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,33 +1,33 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:312px;height:402px;" version="1.1" viewBox="0 0 312 402" width="312px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="g1ehj4wrkcyghw0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="g1h3rozg0diiiu0" x1="0%" x2="100%" y1="50%" y2="50%">
       <stop offset="0%" stop-color="#90EE90"/>
       <stop offset="100%" stop-color="#FFFF00"/>
     </linearGradient>
-    <filter height="300%" id="f1ehj4wrkcyghw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1h3rozg0diiiu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
       <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
     </filter>
-    <linearGradient id="g1ehj4wrkcyghw1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="g1h3rozg0diiiu1" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#g1ehj4wrkcyghw0)" filter="url(#f1ehj4wrkcyghw)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
-      <rect fill="url(#g1ehj4wrkcyghw1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#g1h3rozg0diiiu0)" filter="url(#f1h3rozg0diiiu)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
+      <rect fill="url(#g1h3rozg0diiiu1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
       <ellipse cx="21" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,224.6406 Q23.3906,224.9375 22.75,225.0781 Q22.1094,225.2344 21.4063,225.2344 Q18.9063,225.2344 17.5781,223.5938 Q16.2656,221.9375 16.2656,218.8125 Q16.2656,215.6875 17.5781,214.0313 Q18.9063,212.375 21.4063,212.375 Q22.1094,212.375 22.75,212.5313 Q23.4063,212.6875 23.9688,212.9844 L23.9688,215.7031 Q23.3438,215.125 22.75,214.8594 Q22.1563,214.5781 21.5313,214.5781 Q20.1875,214.5781 19.5,215.6563 Q18.8125,216.7188 18.8125,218.8125 Q18.8125,220.9063 19.5,221.9844 Q20.1875,223.0469 21.5313,223.0469 Q22.1563,223.0469 22.75,222.7813 Q23.3438,222.5 23.9688,221.9219 L23.9688,224.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="223.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="235" y2="235"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="243" y2="243"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ehj4wrkcyghw)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/>
       <ellipse cx="98.9" cy="200" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M103.0094,206 L95.2906,206 L95.2906,193.6094 L103.0094,193.6094 L103.0094,195.7656 L97.7438,195.7656 L97.7438,198.4375 L102.5094,198.4375 L102.5094,200.5938 L97.7438,200.5938 L97.7438,203.8438 L103.0094,203.8438 L103.0094,206 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.1" y="204.1543">B</text>
@@ -37,8 +37,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="89" y="255.8198">three</text>
       <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="262.4141" y2="262.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#f1ehj4wrkcyghw)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#f1h3rozg0diiiu)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
       <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
       <ellipse cx="257.2" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
       <path d="M260.1688,352.6406 Q259.5906,352.9375 258.95,353.0781 Q258.3094,353.2344 257.6063,353.2344 Q255.1063,353.2344 253.7781,351.5938 Q252.4656,349.9375 252.4656,346.8125 Q252.4656,343.6875 253.7781,342.0313 Q255.1063,340.375 257.6063,340.375 Q258.3094,340.375 258.95,340.5313 Q259.6063,340.6875 260.1688,340.9844 L260.1688,343.7031 Q259.5438,343.125 258.95,342.8594 Q258.3563,342.5781 257.7313,342.5781 Q256.3875,342.5781 255.7,343.6563 Q255.0125,344.7188 255.0125,346.8125 Q255.0125,348.9063 255.7,349.9844 Q256.3875,351.0469 257.7313,351.0469 Q258.3563,351.0469 258.95,350.7813 Q259.5438,350.5 260.1688,349.9219 L260.1688,352.6406 Z "/>
@@ -47,23 +47,23 @@
       <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="291.5" y="340.1387">T</text>
       <line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="363" y2="363"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="245.5" y="369"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="247.5" y="371"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="259.5" y="377.2104">ttt : T</text>
     </a>
     <line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="383.8047" y2="383.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ehj4wrkcyghw)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/>
       <ellipse cx="176.5" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M179.4688,224.6406 Q178.8906,224.9375 178.25,225.0781 Q177.6094,225.2344 176.9063,225.2344 Q174.4063,225.2344 173.0781,223.5938 Q171.7656,221.9375 171.7656,218.8125 Q171.7656,215.6875 173.0781,214.0313 Q174.4063,212.375 176.9063,212.375 Q177.6094,212.375 178.25,212.5313 Q178.9063,212.6875 179.4688,212.9844 L179.4688,215.7031 Q178.8438,215.125 178.25,214.8594 Q177.6563,214.5781 177.0313,214.5781 Q175.6875,214.5781 175,215.6563 Q174.3125,216.7188 174.3125,218.8125 Q174.3125,220.9063 175,221.9844 Q175.6875,223.0469 177.0313,223.0469 Q177.6563,223.0469 178.25,222.7813 Q178.8438,222.5 179.4688,221.9219 L179.4688,224.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="190.5" y="223.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="235" y2="235"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="243" y2="243"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1ehj4wrkcyghw)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/>
+    <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/>
     <ellipse cx="253" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M255.9688,224.6406 Q255.3906,224.9375 254.75,225.0781 Q254.1094,225.2344 253.4063,225.2344 Q250.9063,225.2344 249.5781,223.5938 Q248.2656,221.9375 248.2656,218.8125 Q248.2656,215.6875 249.5781,214.0313 Q250.9063,212.375 253.4063,212.375 Q254.1094,212.375 254.75,212.5313 Q255.4063,212.6875 255.9688,212.9844 L255.9688,215.7031 Q255.3438,215.125 254.75,214.8594 Q254.1563,214.5781 253.5313,214.5781 Q252.1875,214.5781 251.5,215.6563 Q250.8125,216.7188 250.8125,218.8125 Q250.8125,220.9063 251.5,221.9844 Q252.1875,223.0469 253.5313,223.0469 Q254.1563,223.0469 254.75,222.7813 Q255.3438,222.5 255.9688,221.9219 L255.9688,224.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="267" y="223.1543">C</text>
@@ -71,39 +71,39 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="284" y="212.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="235" y2="235"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="243" y2="243"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ehj4wrkcyghw)" height="99.2188" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="99.2188" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/>
       <ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="46"/>
       <ellipse cx="81" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="90" y="54.2104">aaa : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="58.8047"/>
       <ellipse cx="81" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="71.6094"/>
       <ellipse cx="81" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="90" y="79.8198">ccc : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="84.4141"/>
       <ellipse cx="81" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="90" y="92.6245">ddd : D *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 42f5d3b2..275f148e 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:743px;height:326px;" version="1.1" viewBox="0 0 743 326" width="743px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f3cjabz6kwa7k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fsc6o2d3ps4h5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,24 +9,24 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/>
       <ellipse cx="58.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M61.4688,167.6406 Q60.8906,167.9375 60.25,168.0781 Q59.6094,168.2344 58.9063,168.2344 Q56.4063,168.2344 55.0781,166.5938 Q53.7656,164.9375 53.7656,161.8125 Q53.7656,158.6875 55.0781,157.0313 Q56.4063,155.375 58.9063,155.375 Q59.6094,155.375 60.25,155.5313 Q60.9063,155.6875 61.4688,155.9844 L61.4688,158.7031 Q60.8438,158.125 60.25,157.8594 Q59.6563,157.5781 59.0313,157.5781 Q57.6875,157.5781 57,158.6563 Q56.3125,159.7188 56.3125,161.8125 Q56.3125,163.9063 57,164.9844 Q57.6875,166.0469 59.0313,166.0469 Q59.6563,166.0469 60.25,165.7813 Q60.8438,165.5 61.4688,164.9219 L61.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="72.5" y="166.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L10" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L10" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L10" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L10" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/>
       <ellipse cx="194" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,283.1406 Q196.3906,283.4375 195.75,283.5781 Q195.1094,283.7344 194.4063,283.7344 Q191.9063,283.7344 190.5781,282.0938 Q189.2656,280.4375 189.2656,277.3125 Q189.2656,274.1875 190.5781,272.5313 Q191.9063,270.875 194.4063,270.875 Q195.1094,270.875 195.75,271.0313 Q196.4063,271.1875 196.9688,271.4844 L196.9688,274.2031 Q196.3438,273.625 195.75,273.3594 Q195.1563,273.0781 194.5313,273.0781 Q193.1875,273.0781 192.5,274.1563 Q191.8125,275.2188 191.8125,277.3125 Q191.8125,279.4063 192.5,280.4844 Q193.1875,281.5469 194.5313,281.5469 Q195.1563,281.5469 195.75,281.2813 Q196.3438,281 196.9688,280.4219 L196.9688,283.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="208" y="281.6543">TBase</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="293.5" y2="293.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="301.5" y2="301.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/>
       <ellipse cx="338.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M341.7188,276.6406 Q341.1406,276.9375 340.5,277.0781 Q339.8594,277.2344 339.1563,277.2344 Q336.6563,277.2344 335.3281,275.5938 Q334.0156,273.9375 334.0156,270.8125 Q334.0156,267.6875 335.3281,266.0313 Q336.6563,264.375 339.1563,264.375 Q339.8594,264.375 340.5,264.5313 Q341.1563,264.6875 341.7188,264.9844 L341.7188,267.7031 Q341.0938,267.125 340.5,266.8594 Q339.9063,266.5781 339.2813,266.5781 Q337.9375,266.5781 337.25,267.6563 Q336.5625,268.7188 336.5625,270.8125 Q336.5625,272.9063 337.25,273.9844 Q337.9375,275.0469 339.2813,275.0469 Q339.9063,275.0469 340.5,274.7813 Q341.0938,274.5 341.7188,273.9219 L341.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="275.1543">A</text>
@@ -35,8 +35,8 @@
       <ellipse cx="295" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="304" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/>
       <ellipse cx="499.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M502.7188,276.6406 Q502.1406,276.9375 501.5,277.0781 Q500.8594,277.2344 500.1563,277.2344 Q497.6563,277.2344 496.3281,275.5938 Q495.0156,273.9375 495.0156,270.8125 Q495.0156,267.6875 496.3281,266.0313 Q497.6563,264.375 500.1563,264.375 Q500.8594,264.375 501.5,264.5313 Q502.1563,264.6875 502.7188,264.9844 L502.7188,267.7031 Q502.0938,267.125 501.5,266.8594 Q500.9063,266.5781 500.2813,266.5781 Q498.9375,266.5781 498.25,267.6563 Q497.5625,268.7188 497.5625,270.8125 Q497.5625,272.9063 498.25,273.9844 Q498.9375,275.0469 500.2813,275.0469 Q500.9063,275.0469 501.5,274.7813 Q502.0938,274.5 502.7188,273.9219 L502.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="520.25" y="275.1543">B</text>
@@ -45,8 +45,8 @@
       <ellipse cx="456" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="465" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/>
       <ellipse cx="660.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M663.7188,276.6406 Q663.1406,276.9375 662.5,277.0781 Q661.8594,277.2344 661.1563,277.2344 Q658.6563,277.2344 657.3281,275.5938 Q656.0156,273.9375 656.0156,270.8125 Q656.0156,267.6875 657.3281,266.0313 Q658.6563,264.375 661.1563,264.375 Q661.8594,264.375 662.5,264.5313 Q663.1563,264.6875 663.7188,264.9844 L663.7188,267.7031 Q663.0938,267.125 662.5,266.8594 Q661.9063,266.5781 661.2813,266.5781 Q659.9375,266.5781 659.25,267.6563 Q658.5625,268.7188 658.5625,270.8125 Q658.5625,272.9063 659.25,273.9844 Q659.9375,275.0469 661.2813,275.0469 Q661.9063,275.0469 662.5,274.7813 Q663.0938,274.5 663.7188,273.9219 L663.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="681.25" y="275.1543">C</text>
@@ -55,8 +55,8 @@
       <ellipse cx="617" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="626" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L26" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L26" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="6" y="255"/>
       <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="35" y="275.1543">Overload</text>
@@ -64,15 +64,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="99" y="264.1387">T,L,Ts...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="301.2104">counter : L</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="307.8047" y2="307.8047"/>
-    <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/>
+    <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/>
     <ellipse cx="270" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M272.9688,167.6406 Q272.3906,167.9375 271.75,168.0781 Q271.1094,168.2344 270.4063,168.2344 Q267.9063,168.2344 266.5781,166.5938 Q265.2656,164.9375 265.2656,161.8125 Q265.2656,158.6875 266.5781,157.0313 Q267.9063,155.375 270.4063,155.375 Q271.1094,155.375 271.75,155.5313 Q272.4063,155.6875 272.9688,155.9844 L272.9688,158.7031 Q272.3438,158.125 271.75,157.8594 Q271.1563,157.5781 270.5313,157.5781 Q269.1875,157.5781 268.5,158.6563 Q267.8125,159.7188 267.8125,161.8125 Q267.8125,163.9063 268.5,164.9844 Q269.1875,166.0469 270.5313,166.0469 Q271.1563,166.0469 271.75,165.7813 Q272.3438,165.5 272.9688,164.9219 L272.9688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="284" y="166.1543">Overload</text>
@@ -80,18 +80,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="348" y="155.1387">TBase,int,A,B,C</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3cjabz6kwa7k)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/>
       <ellipse cx="338.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M341.7188,29.6406 Q341.1406,29.9375 340.5,30.0781 Q339.8594,30.2344 339.1563,30.2344 Q336.6563,30.2344 335.3281,28.5938 Q334.0156,26.9375 334.0156,23.8125 Q334.0156,20.6875 335.3281,19.0313 Q336.6563,17.375 339.1563,17.375 Q339.8594,17.375 340.5,17.5313 Q341.1563,17.6875 341.7188,17.9844 L341.7188,20.7031 Q341.0938,20.125 340.5,19.8594 Q339.9063,19.5781 339.2813,19.5781 Q337.9375,19.5781 337.25,20.6563 Q336.5625,21.7188 336.5625,23.8125 Q336.5625,25.9063 337.25,26.9844 Q337.9375,28.0469 339.2813,28.0469 Q339.9063,28.0469 340.5,27.7813 Q341.0938,27.5 341.7188,26.9219 L341.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="230.5" y="46"/>
       <ellipse cx="235.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="244.5" y="54.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 5f919407..2e76310c 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="570px" preserveAspectRatio="none" style="width:435px;height:570px;" version="1.1" viewBox="0 0 435 570" width="435px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1sget96j2hq0d" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkm9ewai6vggz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
       <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="137.5" y="264.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="293"/>
       <ellipse cx="87.5" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="301.2104">aaa : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="307.8047" y2="307.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
       <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
@@ -35,16 +35,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="269.5" y="386.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="415"/>
       <ellipse cx="219.5" cy="420" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="423.2104">bbb : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="429.8047" y2="429.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
       <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
@@ -52,30 +52,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="311" y="508.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="537"/>
       <ellipse cx="264" cy="542" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="545.2104">ccc : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="551.8047" y2="551.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
       <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="537"/>
       <ellipse cx="362" cy="542" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="545.2104">ddd : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="551.8047" y2="551.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
+    <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
     <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="356" y="392.6387">D</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="415.5" y2="415.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="423.5" y2="423.5"/>
-    <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
+    <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
     <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="270.6387">std::unique_ptr&lt;C&lt;D&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="293.5" y2="293.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="301.5" y2="301.5"/>
-    <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
+    <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
     <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
@@ -99,18 +99,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="179" x="64" y="155.1387">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sget96j2hq0d)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
       <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="54.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index 0dc989bf..c391f4b1 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="218px" preserveAspectRatio="none" style="width:866px;height:218px;" version="1.1" viewBox="0 0 866 218" width="866px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1adl3nv8humqe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fje7uul4wnkvl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="6" y="8"/>
       <ellipse cx="112.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.7188,29.6406 Q115.1406,29.9375 114.5,30.0781 Q113.8594,30.2344 113.1563,30.2344 Q110.6563,30.2344 109.3281,28.5938 Q108.0156,26.9375 108.0156,23.8125 Q108.0156,20.6875 109.3281,19.0313 Q110.6563,17.375 113.1563,17.375 Q113.8594,17.375 114.5,17.5313 Q115.1563,17.6875 115.7188,17.9844 L115.7188,20.7031 Q115.0938,20.125 114.5,19.8594 Q113.9063,19.5781 113.2813,19.5781 Q111.9375,19.5781 111.25,20.6563 Q110.5625,21.7188 110.5625,23.8125 Q110.5625,25.9063 111.25,26.9844 Q111.9375,28.0469 113.2813,28.0469 Q113.9063,28.0469 114.5,27.7813 Q115.0938,27.5 115.7188,26.9219 L115.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="133.25" y="28.1543">Void</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="217" x="26" y="75.0151">operator!=(const Void &amp; ) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="413" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="413" y="159"/>
       <ellipse cx="428" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M430.9688,180.6406 Q430.3906,180.9375 429.75,181.0781 Q429.1094,181.2344 428.4063,181.2344 Q425.9063,181.2344 424.5781,179.5938 Q423.2656,177.9375 423.2656,174.8125 Q423.2656,171.6875 424.5781,170.0313 Q425.9063,168.375 428.4063,168.375 Q429.1094,168.375 429.75,168.5313 Q430.4063,168.6875 430.9688,168.9844 L430.9688,171.7031 Q430.3438,171.125 429.75,170.8594 Q429.1563,170.5781 428.5313,170.5781 Q427.1875,170.5781 426.5,171.6563 Q425.8125,172.7188 425.8125,174.8125 Q425.8125,176.9063 426.5,177.9844 Q427.1875,179.0469 428.5313,179.0469 Q429.1563,179.0469 429.75,178.7813 Q430.3438,178.5 430.9688,177.9219 L430.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="442" y="179.1543">lift_void</text>
@@ -31,16 +31,16 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="501" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="501" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0002248590285629363950" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="290.5" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0002248590285629363950" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="290.5" y="21"/>
       <ellipse cx="305.5" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M308.4688,42.6406 Q307.8906,42.9375 307.25,43.0781 Q306.6094,43.2344 305.9063,43.2344 Q303.4063,43.2344 302.0781,41.5938 Q300.7656,39.9375 300.7656,36.8125 Q300.7656,33.6875 302.0781,32.0313 Q303.4063,30.375 305.9063,30.375 Q306.6094,30.375 307.25,30.5313 Q307.9063,30.6875 308.4688,30.9844 L308.4688,33.7031 Q307.8438,33.125 307.25,32.8594 Q306.6563,32.5781 306.0313,32.5781 Q304.6875,32.5781 304,33.6563 Q303.3125,34.7188 303.3125,36.8125 Q303.3125,38.9063 304,39.9844 Q304.6875,41.0469 306.0313,41.0469 Q306.6563,41.0469 307.25,40.7813 Q307.8438,40.5 308.4688,39.9219 L308.4688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="319.5" y="41.1543">lift_void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="291.5" x2="367.5" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="291.5" x2="367.5" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="404" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="404" y="21"/>
       <ellipse cx="419" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M421.9688,42.6406 Q421.3906,42.9375 420.75,43.0781 Q420.1094,43.2344 419.4063,43.2344 Q416.9063,43.2344 415.5781,41.5938 Q414.2656,39.9375 414.2656,36.8125 Q414.2656,33.6875 415.5781,32.0313 Q416.9063,30.375 419.4063,30.375 Q420.1094,30.375 420.75,30.5313 Q421.4063,30.6875 421.9688,30.9844 L421.9688,33.7031 Q421.3438,33.125 420.75,32.8594 Q420.1563,32.5781 419.5313,32.5781 Q418.1875,32.5781 417.5,33.6563 Q416.8125,34.7188 416.8125,36.8125 Q416.8125,38.9063 417.5,39.9844 Q418.1875,41.0469 419.5313,41.0469 Q420.1563,41.0469 420.75,40.7813 Q421.3438,40.5 421.9688,39.9219 L421.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="433" y="41.1543">lift_void</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="510" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="510" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556" y="159"/>
       <ellipse cx="571" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M573.9688,180.6406 Q573.3906,180.9375 572.75,181.0781 Q572.1094,181.2344 571.4063,181.2344 Q568.9063,181.2344 567.5781,179.5938 Q566.2656,177.9375 566.2656,174.8125 Q566.2656,171.6875 567.5781,170.0313 Q568.9063,168.375 571.4063,168.375 Q572.1094,168.375 572.75,168.5313 Q573.4063,168.6875 573.9688,168.9844 L573.9688,171.7031 Q573.3438,171.125 572.75,170.8594 Q572.1563,170.5781 571.5313,170.5781 Q570.1875,170.5781 569.5,171.6563 Q568.8125,172.7188 568.8125,174.8125 Q568.8125,176.9063 569.5,177.9844 Q570.1875,179.0469 571.5313,179.0469 Q572.1563,179.0469 572.75,178.7813 Q573.3438,178.5 573.9688,177.9219 L573.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="585" y="179.1543">drop_void</text>
@@ -59,16 +59,16 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557" x2="658" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557" x2="658" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0001117137420252603013" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="84.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001117137420252603013" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="84.5" y="159"/>
       <ellipse cx="99.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M102.4688,180.6406 Q101.8906,180.9375 101.25,181.0781 Q100.6094,181.2344 99.9063,181.2344 Q97.4063,181.2344 96.0781,179.5938 Q94.7656,177.9375 94.7656,174.8125 Q94.7656,171.6875 96.0781,170.0313 Q97.4063,168.375 99.9063,168.375 Q100.6094,168.375 101.25,168.5313 Q101.9063,168.6875 102.4688,168.9844 L102.4688,171.7031 Q101.8438,171.125 101.25,170.8594 Q100.6563,170.5781 100.0313,170.5781 Q98.6875,170.5781 98,171.6563 Q97.3125,172.7188 97.3125,174.8125 Q97.3125,176.9063 98,177.9844 Q98.6875,179.0469 100.0313,179.0469 Q100.6563,179.0469 101.25,178.7813 Q101.8438,178.5 102.4688,177.9219 L102.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="113.5" y="179.1543">drop_void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85.5" x2="175.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85.5" x2="175.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="546" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="546" y="21"/>
       <ellipse cx="561" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M563.9688,42.6406 Q563.3906,42.9375 562.75,43.0781 Q562.1094,43.2344 561.4063,43.2344 Q558.9063,43.2344 557.5781,41.5938 Q556.2656,39.9375 556.2656,36.8125 Q556.2656,33.6875 557.5781,32.0313 Q558.9063,30.375 561.4063,30.375 Q562.1094,30.375 562.75,30.5313 Q563.4063,30.6875 563.9688,30.9844 L563.9688,33.7031 Q563.3438,33.125 562.75,32.8594 Q562.1563,32.5781 561.5313,32.5781 Q560.1875,32.5781 559.5,33.6563 Q558.8125,34.7188 558.8125,36.8125 Q558.8125,38.9063 559.5,39.9844 Q560.1875,41.0469 561.5313,41.0469 Q562.1563,41.0469 562.75,40.7813 Q563.3438,40.5 563.9688,39.9219 L563.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="575" y="41.1543">drop_void</text>
@@ -77,33 +77,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="547" x2="668" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="547" x2="668" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="759.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="759.5" y="159"/>
       <ellipse cx="774.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M777.4688,180.6406 Q776.8906,180.9375 776.25,181.0781 Q775.6094,181.2344 774.9063,181.2344 Q772.4063,181.2344 771.0781,179.5938 Q769.7656,177.9375 769.7656,174.8125 Q769.7656,171.6875 771.0781,170.0313 Q772.4063,168.375 774.9063,168.375 Q775.6094,168.375 776.25,168.5313 Q776.9063,168.6875 777.4688,168.9844 L777.4688,171.7031 Q776.8438,171.125 776.25,170.8594 Q775.6563,170.5781 775.0313,170.5781 Q773.6875,170.5781 773,171.6563 Q772.3125,172.7188 772.3125,174.8125 Q772.3125,176.9063 773,177.9844 Q773.6875,179.0469 775.0313,179.0469 Q775.6563,179.0469 776.25,178.7813 Q776.8438,178.5 777.4688,177.9219 L777.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="788.5" y="179.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="798.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="798.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L46" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1adl3nv8humqe)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="704" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L46" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="704" y="8"/>
       <ellipse cx="771.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M774.2188,29.6406 Q773.6406,29.9375 773,30.0781 Q772.3594,30.2344 771.6563,30.2344 Q769.1563,30.2344 767.8281,28.5938 Q766.5156,26.9375 766.5156,23.8125 Q766.5156,20.6875 767.8281,19.0313 Q769.1563,17.375 771.6563,17.375 Q772.3594,17.375 773,17.5313 Q773.6563,17.6875 774.2188,17.9844 L774.2188,20.7031 Q773.5938,20.125 773,19.8594 Q772.4063,19.5781 771.7813,19.5781 Q770.4375,19.5781 769.75,20.6563 Q769.0625,21.7188 769.0625,23.8125 Q769.0625,25.9063 769.75,26.9844 Q770.4375,28.0469 771.7813,28.0469 Q772.4063,28.0469 773,27.7813 Q773.5938,27.5 774.2188,26.9219 L774.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="791.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="854" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="710" y="46"/>
       <ellipse cx="715" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="724" y="54.2104">la : lift_void_t&lt;A&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="710" y="58.8047"/>
       <ellipse cx="715" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="724" y="67.0151">lv : lift_void_t&lt;void&gt; *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="854" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index acfef8ff..42e093c2 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:280px;height:283px;" version="1.1" viewBox="0 0 280 283" width="280px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkvi5jqh7q8lj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hfximd8o2w6s" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkvi5jqh7q8lj)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
       <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L7" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L7" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkvi5jqh7q8lj)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L7" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L7" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="35" y="136.1543">Left</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L10" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkvi5jqh7q8lj)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L10" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
       <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L13" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L13" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkvi5jqh7q8lj)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L13" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L13" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
       <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L16" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00035/t00035.cc#L16" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkvi5jqh7q8lj)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L16" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L16" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
       <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 84809a20..6ddf571f 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fuvpxb3u1pkxl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1wr55gdnpzeq9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fuvpxb3u1pkxl)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#fuvpxb3u1pkxl)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
-    <polygon fill="#FFFFFF" filter="url(#fuvpxb3u1pkxl)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
-    <polygon fill="#FFFFFF" filter="url(#fuvpxb3u1pkxl)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#fuvpxb3u1pkxl)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuvpxb3u1pkxl)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
       <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
@@ -34,8 +34,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="44.5" y="198.0151">yellow</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="204.6094" y2="204.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuvpxb3u1pkxl)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
       <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
@@ -43,15 +43,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="421.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="450"/>
       <ellipse cx="179" cy="455" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="458.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="464.8047" y2="464.8047"/>
-    <rect fill="#FEFECE" filter="url(#fuvpxb3u1pkxl)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
     <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
@@ -59,23 +59,23 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="210" y="312.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="335" y2="335"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="343" y2="343"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuvpxb3u1pkxl)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
       <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="183.5"/>
       <ellipse cx="153" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="191.7104">a_int : A&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="198.3047" y2="198.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuvpxb3u1pkxl)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
       <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index 28aa373a..f60051fd 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmx5yyk0nshg3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7hofzfyhcdce" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,98 +9,98 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmx5yyk0nshg3)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
       <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
       <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_620)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_739)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmx5yyk0nshg3)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
       <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348"/>
       <ellipse cx="17" cy="353" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="356.2104">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360.8047"/>
       <ellipse cx="17" cy="365.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="369.0151">x : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="373.6094"/>
       <ellipse cx="17" cy="378.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="381.8198">y : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="386.4141"/>
       <ellipse cx="17" cy="391.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="394.6245">z : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="401.2188" y2="401.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmx5yyk0nshg3)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
       <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="360.5"/>
       <ellipse cx="188" cy="365.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="368.7104">c : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="373.3047"/>
       <ellipse cx="188" cy="378.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="381.5151">h : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="388.1094" y2="388.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmx5yyk0nshg3)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
       <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="54.2104">st : ST</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index fcd6eb12..3d0a5f09 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:2325px;height:321px;" version="1.1" viewBox="0 0 2325 321" width="2325px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1x70fuqomw8h7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ane1pbfeux41" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="281.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="281.5" y="224"/>
       <ellipse cx="296.5" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M300.6094,246 L292.8906,246 L292.8906,233.6094 L300.6094,233.6094 L300.6094,235.7656 L295.3438,235.7656 L295.3438,238.4375 L300.1094,238.4375 L300.1094,240.5938 L295.3438,240.5938 L295.3438,243.8438 L300.6094,243.8438 L300.6094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="310.5" y="244.1543">thirdparty::ns1::color_t</text>
@@ -20,16 +20,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="287.5" y="295.8198">blue</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="282.5" x2="454.5" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="132.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="132.5" y="8"/>
       <ellipse cx="147.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M150.4688,29.6406 Q149.8906,29.9375 149.25,30.0781 Q148.6094,30.2344 147.9063,30.2344 Q145.4063,30.2344 144.0781,28.5938 Q142.7656,26.9375 142.7656,23.8125 Q142.7656,20.6875 144.0781,19.0313 Q145.4063,17.375 147.9063,17.375 Q148.6094,17.375 149.25,17.5313 Q149.9063,17.6875 150.4688,17.9844 L150.4688,20.7031 Q149.8438,20.125 149.25,19.8594 Q148.6563,19.5781 148.0313,19.5781 Q146.6875,19.5781 146,20.6563 Q145.3125,21.7188 145.3125,23.8125 Q145.3125,25.9063 146,26.9844 Q146.6875,28.0469 148.0313,28.0469 Q148.6563,28.0469 149.25,27.7813 Q149.8438,27.5 150.4688,26.9219 L150.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="161.5" y="28.1543">thirdparty::ns1::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133.5" x2="271.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133.5" x2="271.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L22" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1388.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L22" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1388.5" y="224"/>
       <ellipse cx="1403.5" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1407.6094,246 L1399.8906,246 L1399.8906,233.6094 L1407.6094,233.6094 L1407.6094,235.7656 L1402.3438,235.7656 L1402.3438,238.4375 L1407.1094,238.4375 L1407.1094,240.5938 L1402.3438,240.5938 L1402.3438,243.8438 L1407.6094,243.8438 L1407.6094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1417.5" y="244.1543">property_t</text>
@@ -39,47 +39,47 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1394.5" y="295.8198">property_c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389.5" x2="1483.5" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1416.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1416.5" y="8"/>
       <ellipse cx="1431.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1434.4688,29.6406 Q1433.8906,29.9375 1433.25,30.0781 Q1432.6094,30.2344 1431.9063,30.2344 Q1429.4063,30.2344 1428.0781,28.5938 Q1426.7656,26.9375 1426.7656,23.8125 Q1426.7656,20.6875 1428.0781,19.0313 Q1429.4063,17.375 1431.9063,17.375 Q1432.6094,17.375 1433.25,17.5313 Q1433.9063,17.6875 1434.4688,17.9844 L1434.4688,20.7031 Q1433.8438,20.125 1433.25,19.8594 Q1432.6563,19.5781 1432.0313,19.5781 Q1430.6875,19.5781 1430,20.6563 Q1429.3125,21.7188 1429.3125,23.8125 Q1429.3125,25.9063 1430,26.9844 Q1430.6875,28.0469 1432.0313,28.0469 Q1432.6563,28.0469 1433.25,27.7813 Q1433.8438,27.5 1434.4688,26.9219 L1434.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1445.5" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1417.5" x2="1455.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1417.5" x2="1455.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="909.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="909.5" y="8"/>
       <ellipse cx="924.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M927.4688,29.6406 Q926.8906,29.9375 926.25,30.0781 Q925.6094,30.2344 924.9063,30.2344 Q922.4063,30.2344 921.0781,28.5938 Q919.7656,26.9375 919.7656,23.8125 Q919.7656,20.6875 921.0781,19.0313 Q922.4063,17.375 924.9063,17.375 Q925.6094,17.375 926.25,17.5313 Q926.9063,17.6875 927.4688,17.9844 L927.4688,20.7031 Q926.8438,20.125 926.25,19.8594 Q925.6563,19.5781 925.0313,19.5781 Q923.6875,19.5781 923,20.6563 Q922.3125,21.7188 922.3125,23.8125 Q922.3125,25.9063 923,26.9844 Q923.6875,28.0469 925.0313,28.0469 Q925.6563,28.0469 926.25,27.7813 Q926.8438,27.5 927.4688,26.9219 L927.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="938.5" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="910.5" x2="948.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="910.5" x2="948.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1978.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1978.5" y="8"/>
       <ellipse cx="1993.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1996.4688,29.6406 Q1995.8906,29.9375 1995.25,30.0781 Q1994.6094,30.2344 1993.9063,30.2344 Q1991.4063,30.2344 1990.0781,28.5938 Q1988.7656,26.9375 1988.7656,23.8125 Q1988.7656,20.6875 1990.0781,19.0313 Q1991.4063,17.375 1993.9063,17.375 Q1994.6094,17.375 1995.25,17.5313 Q1995.9063,17.6875 1996.4688,17.9844 L1996.4688,20.7031 Q1995.8438,20.125 1995.25,19.8594 Q1994.6563,19.5781 1994.0313,19.5781 Q1992.6875,19.5781 1992,20.6563 Q1991.3125,21.7188 1991.3125,23.8125 Q1991.3125,25.9063 1992,26.9844 Q1992.6875,28.0469 1994.0313,28.0469 Q1994.6563,28.0469 1995.25,27.7813 Q1995.8438,27.5 1996.4688,26.9219 L1996.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="2007.5" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1979.5" x2="2017.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1979.5" x2="2017.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L31" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L31" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1940.5" y="236.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L31" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L31" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1940.5" y="236.5"/>
       <ellipse cx="1978.9" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1981.8688,258.1406 Q1981.2906,258.4375 1980.65,258.5781 Q1980.0094,258.7344 1979.3063,258.7344 Q1976.8063,258.7344 1975.4781,257.0938 Q1974.1656,255.4375 1974.1656,252.3125 Q1974.1656,249.1875 1975.4781,247.5313 Q1976.8063,245.875 1979.3063,245.875 Q1980.0094,245.875 1980.65,246.0313 Q1981.3063,246.1875 1981.8688,246.4844 L1981.8688,249.2031 Q1981.2438,248.625 1980.65,248.3594 Q1980.0563,248.0781 1979.4313,248.0781 Q1978.0875,248.0781 1977.4,249.1563 Q1976.7125,250.2188 1976.7125,252.3125 Q1976.7125,254.4063 1977.4,255.4844 Q1978.0875,256.5469 1979.4313,256.5469 Q1980.0563,256.5469 1980.65,256.2813 Q1981.2438,256 1981.8688,255.4219 L1981.8688,258.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1998.1" y="256.6543">key_t</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1941.5" x2="2055.5" y1="268.5" y2="268.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1946.5" y="274.5"/>
       <ellipse cx="1951.5" cy="279.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1960.5" y="282.7104">key : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1941.5" x2="2055.5" y1="289.3047" y2="289.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L35" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L35" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="1088.5" y="243"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L35" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L35" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="1088.5" y="243"/>
       <ellipse cx="1103.5" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1106.4688,264.6406 Q1105.8906,264.9375 1105.25,265.0781 Q1104.6094,265.2344 1103.9063,265.2344 Q1101.4063,265.2344 1100.0781,263.5938 Q1098.7656,261.9375 1098.7656,258.8125 Q1098.7656,255.6875 1100.0781,254.0313 Q1101.4063,252.375 1103.9063,252.375 Q1104.6094,252.375 1105.25,252.5313 Q1105.9063,252.6875 1106.4688,252.9844 L1106.4688,255.7031 Q1105.8438,255.125 1105.25,254.8594 Q1104.6563,254.5781 1104.0313,254.5781 Q1102.6875,254.5781 1102,255.6563 Q1101.3125,256.7188 1101.3125,258.8125 Q1101.3125,260.9063 1102,261.9844 Q1102.6875,263.0469 1104.0313,263.0469 Q1104.6563,263.0469 1105.25,262.7813 Q1105.8438,262.5 1106.4688,261.9219 L1106.4688,264.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1117.5" y="263.1543">map</text>
@@ -88,16 +88,16 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1089.5" x2="1157.5" y1="275" y2="275"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1089.5" x2="1157.5" y1="283" y2="283"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0001396273728762362113" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001396273728762362113" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="64" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="64" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="100.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="100.5" y="116"/>
       <ellipse cx="115.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M118.4688,137.6406 Q117.8906,137.9375 117.25,138.0781 Q116.6094,138.2344 115.9063,138.2344 Q113.4063,138.2344 112.0781,136.5938 Q110.7656,134.9375 110.7656,131.8125 Q110.7656,128.6875 112.0781,127.0313 Q113.4063,125.375 115.9063,125.375 Q116.6094,125.375 117.25,125.5313 Q117.9063,125.6875 118.4688,125.9844 L118.4688,128.7031 Q117.8438,128.125 117.25,127.8594 Q116.6563,127.5781 116.0313,127.5781 Q114.6875,127.5781 114,128.6563 Q113.3125,129.7188 113.3125,131.8125 Q113.3125,133.9063 114,134.9844 Q114.6875,136.0469 116.0313,136.0469 Q116.6563,136.0469 117.25,135.7813 Q117.8438,135.5 118.4688,134.9219 L118.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="129.5" y="136.1543">map</text>
@@ -106,8 +106,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="101.5" x2="635.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="101.5" x2="635.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L44" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L44" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="1222" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L44" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L44" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="1222" y="116"/>
       <ellipse cx="1237" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.9688,137.6406 Q1239.3906,137.9375 1238.75,138.0781 Q1238.1094,138.2344 1237.4063,138.2344 Q1234.9063,138.2344 1233.5781,136.5938 Q1232.2656,134.9375 1232.2656,131.8125 Q1232.2656,128.6875 1233.5781,127.0313 Q1234.9063,125.375 1237.4063,125.375 Q1238.1094,125.375 1238.75,125.5313 Q1239.4063,125.6875 1239.9688,125.9844 L1239.9688,128.7031 Q1239.3438,128.125 1238.75,127.8594 Q1238.1563,127.5781 1237.5313,127.5781 Q1236.1875,127.5781 1235.5,128.6563 Q1234.8125,129.7188 1234.8125,131.8125 Q1234.8125,133.9063 1235.5,134.9844 Q1236.1875,136.0469 1237.5313,136.0469 Q1238.1563,136.0469 1238.75,135.7813 Q1239.3438,135.5 1239.9688,134.9219 L1239.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1251" y="136.1543">map</text>
@@ -116,8 +116,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1223" x2="1650" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1223" x2="1650" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L49" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L49" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="672" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L49" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L49" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="672" y="116"/>
       <ellipse cx="687" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M689.9688,137.6406 Q689.3906,137.9375 688.75,138.0781 Q688.1094,138.2344 687.4063,138.2344 Q684.9063,138.2344 683.5781,136.5938 Q682.2656,134.9375 682.2656,131.8125 Q682.2656,128.6875 683.5781,127.0313 Q684.9063,125.375 687.4063,125.375 Q688.1094,125.375 688.75,125.5313 Q689.4063,125.6875 689.9688,125.9844 L689.9688,128.7031 Q689.3438,128.125 688.75,127.8594 Q688.1563,127.5781 687.5313,127.5781 Q686.1875,127.5781 685.5,128.6563 Q684.8125,129.7188 684.8125,131.8125 Q684.8125,133.9063 685.5,134.9844 Q686.1875,136.0469 687.5313,136.0469 Q688.1563,136.0469 688.75,135.7813 Q689.3438,135.5 689.9688,134.9219 L689.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="701" y="136.1543">map</text>
@@ -126,8 +126,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="673" x2="1186" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="673" x2="1186" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L55" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00038/t00038.cc#L55" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1x70fuqomw8h7)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1686" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L55" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L55" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1686" y="116"/>
       <ellipse cx="1701" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1703.9688,137.6406 Q1703.3906,137.9375 1702.75,138.0781 Q1702.1094,138.2344 1701.4063,138.2344 Q1698.9063,138.2344 1697.5781,136.5938 Q1696.2656,134.9375 1696.2656,131.8125 Q1696.2656,128.6875 1697.5781,127.0313 Q1698.9063,125.375 1701.4063,125.375 Q1702.1094,125.375 1702.75,125.5313 Q1703.4063,125.6875 1703.9688,125.9844 L1703.9688,128.7031 Q1703.3438,128.125 1702.75,127.8594 Q1702.1563,127.5781 1701.5313,127.5781 Q1700.1875,127.5781 1699.5,128.6563 Q1698.8125,129.7188 1698.8125,131.8125 Q1698.8125,133.9063 1699.5,134.9844 Q1700.1875,136.0469 1701.5313,136.0469 Q1702.1563,136.0469 1702.75,135.7813 Q1703.3438,135.5 1703.9688,134.9219 L1703.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1715" y="136.1543">map</text>
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index 8c0376a4..b72cee90 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f457t95g0m553" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1bborplx8ir7k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
       <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
       <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
       <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L21" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L21" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L21" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L21" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
       <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L24" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L24" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
       <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L27" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L27" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
       <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
       <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L33" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L33" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L33" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L33" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
       <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
       <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="288"/>
       <ellipse cx="270" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="296.2104">b : B *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L41" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L41" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L41" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L41" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
       <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L51" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L51" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
       <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
@@ -105,16 +105,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="523" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="46"/>
       <ellipse cx="458" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="54.2104">t : T *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L55" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L55" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L55" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L55" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
       <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
@@ -122,16 +122,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="450.5" y="138.1387">T,M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="167"/>
       <ellipse cx="378.5" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="175.2104">m : M *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L59" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L59" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L59" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L59" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
       <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
@@ -139,16 +139,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="589" y="138.1387">T,M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="167"/>
       <ellipse cx="516" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="175.2104">m : M *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L63" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L63" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f457t95g0m553)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L63" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L63" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
       <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
@@ -156,11 +156,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="34" x="447.5" y="259.1387">T,M,N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="288"/>
       <ellipse cx="368.5" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="296.2104">n : N *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="302.8047" y2="302.8047"/>
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index 3ea186c5..a12fdaf4 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fh7o394iuyusa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f138ylxx2mad24" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,50 +9,50 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh7o394iuyusa)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
       <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <polygon fill="none" points="24,46,28,50,24,54,20,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="54.2104">ii_ : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
     <ellipse cx="24" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="75.0151">get_a() : int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L19" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L19" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh7o394iuyusa)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L19" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L19" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
       <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L23" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L23" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh7o394iuyusa)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L23" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L23" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
       <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
       <ellipse cx="17" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="296.2104">b : B *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
     <ellipse cx="17" cy="313.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="317.0151">get_aaa() : int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fh7o394iuyusa)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
       <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index be2734ad..0782831e 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="368px" preserveAspectRatio="none" style="width:422px;height:368px;" version="1.1" viewBox="0 0 422 368" width="422px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f15ptc6lsrg988" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1pzqnhyncheix" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,100 +9,100 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="55" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="55" y="14.5"/>
       <ellipse cx="70" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M72.9688,36.1406 Q72.3906,36.4375 71.75,36.5781 Q71.1094,36.7344 70.4063,36.7344 Q67.9063,36.7344 66.5781,35.0938 Q65.2656,33.4375 65.2656,30.3125 Q65.2656,27.1875 66.5781,25.5313 Q67.9063,23.875 70.4063,23.875 Q71.1094,23.875 71.75,24.0313 Q72.4063,24.1875 72.9688,24.4844 L72.9688,27.2031 Q72.3438,26.625 71.75,26.3594 Q71.1563,26.0781 70.5313,26.0781 Q69.1875,26.0781 68.5,27.1563 Q67.8125,28.2188 67.8125,30.3125 Q67.8125,32.4063 68.5,33.4844 Q69.1875,34.5469 70.5313,34.5469 Q71.1563,34.5469 71.75,34.2813 Q72.3438,34 72.9688,33.4219 L72.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="84" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="56" x2="94" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="56" x2="94" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="130" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="130" y="8"/>
       <ellipse cx="158.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.9188,29.6406 Q161.3406,29.9375 160.7,30.0781 Q160.0594,30.2344 159.3563,30.2344 Q156.8563,30.2344 155.5281,28.5938 Q154.2156,26.9375 154.2156,23.8125 Q154.2156,20.6875 155.5281,19.0313 Q156.8563,17.375 159.3563,17.375 Q160.0594,17.375 160.7,17.5313 Q161.3563,17.6875 161.9188,17.9844 L161.9188,20.7031 Q161.2938,20.125 160.7,19.8594 Q160.1063,19.5781 159.4813,19.5781 Q158.1375,19.5781 157.45,20.6563 Q156.7625,21.7188 156.7625,23.8125 Q156.7625,25.9063 157.45,26.9844 Q158.1375,28.0469 159.4813,28.0469 Q160.1063,28.0469 160.7,27.7813 Q161.2938,27.5 161.9188,26.9219 L161.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="176.05" y="28.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131" x2="201" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136" y="46"/>
       <ellipse cx="141" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="150" y="54.2104">rr : RR *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="131" x2="201" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="309"/>
       <ellipse cx="21" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,330.6406 Q23.3906,330.9375 22.75,331.0781 Q22.1094,331.2344 21.4063,331.2344 Q18.9063,331.2344 17.5781,329.5938 Q16.2656,327.9375 16.2656,324.8125 Q16.2656,321.6875 17.5781,320.0313 Q18.9063,318.375 21.4063,318.375 Q22.1094,318.375 22.75,318.5313 Q23.4063,318.6875 23.9688,318.9844 L23.9688,321.7031 Q23.3438,321.125 22.75,320.8594 Q22.1563,320.5781 21.5313,320.5781 Q20.1875,320.5781 19.5,321.6563 Q18.8125,322.7188 18.8125,324.8125 Q18.8125,326.9063 19.5,327.9844 Q20.1875,329.0469 21.5313,329.0469 Q22.1563,329.0469 22.75,328.7813 Q23.3438,328.5 23.9688,327.9219 L23.9688,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="329.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="341" y2="341"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="349" y2="349"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L24" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L24" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L24" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L24" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="309"/>
       <ellipse cx="96.5" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,330.6406 Q98.8906,330.9375 98.25,331.0781 Q97.6094,331.2344 96.9063,331.2344 Q94.4063,331.2344 93.0781,329.5938 Q91.7656,327.9375 91.7656,324.8125 Q91.7656,321.6875 93.0781,320.0313 Q94.4063,318.375 96.9063,318.375 Q97.6094,318.375 98.25,318.5313 Q98.9063,318.6875 99.4688,318.9844 L99.4688,321.7031 Q98.8438,321.125 98.25,320.8594 Q97.6563,320.5781 97.0313,320.5781 Q95.6875,320.5781 95,321.6563 Q94.3125,322.7188 94.3125,324.8125 Q94.3125,326.9063 95,327.9844 Q95.6875,329.0469 97.0313,329.0469 Q97.6563,329.0469 98.25,328.7813 Q98.8438,328.5 99.4688,327.9219 L99.4688,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="329.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="341" y2="341"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="349" y2="349"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L32" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="86.4141" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="49.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L32" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="86.4141" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="49.5" y="146"/>
       <ellipse cx="89.25" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M92.2188,167.6406 Q91.6406,167.9375 91,168.0781 Q90.3594,168.2344 89.6563,168.2344 Q87.1563,168.2344 85.8281,166.5938 Q84.5156,164.9375 84.5156,161.8125 Q84.5156,158.6875 85.8281,157.0313 Q87.1563,155.375 89.6563,155.375 Q90.3594,155.375 91,155.5313 Q91.6563,155.6875 92.2188,155.9844 L92.2188,158.7031 Q91.5938,158.125 91,157.8594 Q90.4063,157.5781 89.7813,157.5781 Q88.4375,157.5781 87.75,158.6563 Q87.0625,159.7188 87.0625,161.8125 Q87.0625,163.9063 87.75,164.9844 Q88.4375,166.0469 89.7813,166.0469 Q90.4063,166.0469 91,165.7813 Q91.5938,165.5 92.2188,164.9219 L92.2188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.75" y="166.1543">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="151.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="184"/>
       <ellipse cx="60.5" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="69.5" y="192.2104">e : E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="196.8047"/>
       <ellipse cx="60.5" cy="201.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="69.5" y="205.0151">f : F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="209.6094"/>
       <ellipse cx="60.5" cy="214.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="69.5" y="217.8198">g : detail::G *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="151.5" y1="224.4141" y2="224.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L38" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L38" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="309"/>
       <ellipse cx="171" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,330.6406 Q173.3906,330.9375 172.75,331.0781 Q172.1094,331.2344 171.4063,331.2344 Q168.9063,331.2344 167.5781,329.5938 Q166.2656,327.9375 166.2656,324.8125 Q166.2656,321.6875 167.5781,320.0313 Q168.9063,318.375 171.4063,318.375 Q172.1094,318.375 172.75,318.5313 Q173.4063,318.6875 173.9688,318.9844 L173.9688,321.7031 Q173.3438,321.125 172.75,320.8594 Q172.1563,320.5781 171.5313,320.5781 Q170.1875,320.5781 169.5,321.6563 Q168.8125,322.7188 168.8125,324.8125 Q168.8125,326.9063 169.5,327.9844 Q170.1875,329.0469 171.5313,329.0469 Q172.1563,329.0469 172.75,328.7813 Q173.3438,328.5 173.9688,327.9219 L173.9688,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="329.1543">RRR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="341" y2="341"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="349" y2="349"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L42" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="286" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L42" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="286" y="14.5"/>
       <ellipse cx="301" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M303.9688,36.1406 Q303.3906,36.4375 302.75,36.5781 Q302.1094,36.7344 301.4063,36.7344 Q298.9063,36.7344 297.5781,35.0938 Q296.2656,33.4375 296.2656,30.3125 Q296.2656,27.1875 297.5781,25.5313 Q298.9063,23.875 301.4063,23.875 Q302.1094,23.875 302.75,24.0313 Q303.4063,24.1875 303.9688,24.4844 L303.9688,27.2031 Q303.3438,26.625 302.75,26.3594 Q302.1563,26.0781 301.5313,26.0781 Q300.1875,26.0781 299.5,27.1563 Q298.8125,28.2188 298.8125,30.3125 Q298.8125,32.4063 299.5,33.4844 Q300.1875,34.5469 301.5313,34.5469 Q302.1563,34.5469 302.75,34.2813 Q303.3438,34 303.9688,33.4219 L303.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="315" y="34.6543">ns1::N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="357" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="357" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L45" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L45" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="212.5" y="165"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L45" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L45" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="212.5" y="165"/>
       <ellipse cx="227.5" cy="181" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.4688,186.6406 Q229.8906,186.9375 229.25,187.0781 Q228.6094,187.2344 227.9063,187.2344 Q225.4063,187.2344 224.0781,185.5938 Q222.7656,183.9375 222.7656,180.8125 Q222.7656,177.6875 224.0781,176.0313 Q225.4063,174.375 227.9063,174.375 Q228.6094,174.375 229.25,174.5313 Q229.9063,174.6875 230.4688,174.9844 L230.4688,177.7031 Q229.8438,177.125 229.25,176.8594 Q228.6563,176.5781 228.0313,176.5781 Q226.6875,176.5781 226,177.6563 Q225.3125,178.7188 225.3125,180.8125 Q225.3125,182.9063 226,183.9844 Q226.6875,185.0469 228.0313,185.0469 Q228.6563,185.0469 229.25,184.7813 Q229.8438,184.5 230.4688,183.9219 L230.4688,186.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="241.5" y="185.1543">ns1::NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213.5" x2="292.5" y1="197" y2="197"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213.5" x2="292.5" y1="205" y2="205"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L48" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00041/t00041.cc#L48" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15ptc6lsrg988)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="329" y="165"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L48" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L48" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="329" y="165"/>
       <ellipse cx="344" cy="181" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M346.9688,186.6406 Q346.3906,186.9375 345.75,187.0781 Q345.1094,187.2344 344.4063,187.2344 Q341.9063,187.2344 340.5781,185.5938 Q339.2656,183.9375 339.2656,180.8125 Q339.2656,177.6875 340.5781,176.0313 Q341.9063,174.375 344.4063,174.375 Q345.1094,174.375 345.75,174.5313 Q346.4063,174.6875 346.9688,174.9844 L346.9688,177.7031 Q346.3438,177.125 345.75,176.8594 Q345.1563,176.5781 344.5313,176.5781 Q343.1875,176.5781 342.5,177.6563 Q341.8125,178.7188 341.8125,180.8125 Q341.8125,182.9063 342.5,183.9844 Q343.1875,185.0469 344.5313,185.0469 Q345.1563,185.0469 345.75,184.7813 Q346.3438,184.5 346.9688,183.9219 L346.9688,186.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="358" y="185.1543">ns1::NM</text>
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index b6677597..dfdb501a 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1a47wrlwfbjps" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fdbzepg2bxc4r" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a47wrlwfbjps)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
       <ellipse cx="152.45" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.4188,157.1406 Q154.8406,157.4375 154.2,157.5781 Q153.5594,157.7344 152.8563,157.7344 Q150.3563,157.7344 149.0281,156.0938 Q147.7156,154.4375 147.7156,151.3125 Q147.7156,148.1875 149.0281,146.5313 Q150.3563,144.875 152.8563,144.875 Q153.5594,144.875 154.2,145.0313 Q154.8563,145.1875 155.4188,145.4844 L155.4188,148.2031 Q154.7938,147.625 154.2,147.3594 Q153.6063,147.0781 152.9813,147.0781 Q151.6375,147.0781 150.95,148.1563 Q150.2625,149.2188 150.2625,151.3125 Q150.2625,153.4063 150.95,154.4844 Q151.6375,155.5469 152.9813,155.5469 Q153.6063,155.5469 154.2,155.2813 Q154.7938,155 155.4188,154.4219 L155.4188,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.55" y="155.6543">A</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="184" y="144.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="167.5" y2="167.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="173.5"/>
       <ellipse cx="148" cy="178.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="157" y="181.7104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="188.3047" y2="188.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a47wrlwfbjps)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
       <ellipse cx="25.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.0188,29.6406 Q27.4406,29.9375 26.8,30.0781 Q26.1594,30.2344 25.4563,30.2344 Q22.9563,30.2344 21.6281,28.5938 Q20.3156,26.9375 20.3156,23.8125 Q20.3156,20.6875 21.6281,19.0313 Q22.9563,17.375 25.4563,17.375 Q26.1594,17.375 26.8,17.5313 Q27.4563,17.6875 28.0188,17.9844 L28.0188,20.7031 Q27.3938,20.125 26.8,19.8594 Q26.2063,19.5781 25.5813,19.5781 Q24.2375,19.5781 23.55,20.6563 Q22.8625,21.7188 22.8625,23.8125 Q22.8625,25.9063 23.55,26.9844 Q24.2375,28.0469 25.5813,28.0469 Q26.2063,28.0469 26.8,27.7813 Q27.3938,27.5 28.0188,26.9219 L28.0188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.95" y="28.1543">A</text>
@@ -35,16 +35,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="61" y="17.1387">void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="54.2104">a : void *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a47wrlwfbjps)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
       <ellipse cx="412.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M415.4688,150.6406 Q414.8906,150.9375 414.25,151.0781 Q413.6094,151.2344 412.9063,151.2344 Q410.4063,151.2344 409.0781,149.5938 Q407.7656,147.9375 407.7656,144.8125 Q407.7656,141.6875 409.0781,140.0313 Q410.4063,138.375 412.9063,138.375 Q413.6094,138.375 414.25,138.5313 Q414.9063,138.6875 415.4688,138.9844 L415.4688,141.7031 Q414.8438,141.125 414.25,140.8594 Q413.6563,140.5781 413.0313,140.5781 Q411.6875,140.5781 411,141.6563 Q410.3125,142.7188 410.3125,144.8125 Q410.3125,146.9063 411,147.9844 Q411.6875,149.0469 413.0313,149.0469 Q413.6563,149.0469 414.25,148.7813 Q414.8438,148.5 415.4688,147.9219 L415.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="426.5" y="149.1543">B</text>
@@ -52,22 +52,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="443.5" y="138.1387">T,K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="167"/>
       <ellipse cx="408.5" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="417.5" y="175.2104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="179.8047"/>
       <ellipse cx="408.5" cy="184.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="417.5" y="188.0151">bb : K</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="194.6094" y2="194.6094"/>
-    <rect fill="#FEFECE" filter="url(#f1a47wrlwfbjps)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
+    <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
     <ellipse cx="134.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M137.4688,36.1406 Q136.8906,36.4375 136.25,36.5781 Q135.6094,36.7344 134.9063,36.7344 Q132.4063,36.7344 131.0781,35.0938 Q129.7656,33.4375 129.7656,30.3125 Q129.7656,27.1875 131.0781,25.5313 Q132.4063,23.875 134.9063,23.875 Q135.6094,23.875 136.25,24.0313 Q136.9063,24.1875 137.4688,24.4844 L137.4688,27.2031 Q136.8438,26.625 136.25,26.3594 Q135.6563,26.0781 135.0313,26.0781 Q133.6875,26.0781 133,27.1563 Q132.3125,28.2188 132.3125,30.3125 Q132.3125,32.4063 133,33.4844 Q133.6875,34.5469 135.0313,34.5469 Q135.6563,34.5469 136.25,34.2813 Q136.8438,34 137.4688,33.4219 L137.4688,36.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.5" y="34.6543">A</text>
@@ -75,7 +75,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="165.5" y="23.6387">double</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="46.5" y2="46.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="54.5" y2="54.5"/>
-    <rect fill="#FEFECE" filter="url(#f1a47wrlwfbjps)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
+    <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
     <ellipse cx="257" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M259.9688,36.1406 Q259.3906,36.4375 258.75,36.5781 Q258.1094,36.7344 257.4063,36.7344 Q254.9063,36.7344 253.5781,35.0938 Q252.2656,33.4375 252.2656,30.3125 Q252.2656,27.1875 253.5781,25.5313 Q254.9063,23.875 257.4063,23.875 Q258.1094,23.875 258.75,24.0313 Q259.4063,24.1875 259.9688,24.4844 L259.9688,27.2031 Q259.3438,26.625 258.75,26.3594 Q258.1563,26.0781 257.5313,26.0781 Q256.1875,26.0781 255.5,27.1563 Q254.8125,28.2188 254.8125,30.3125 Q254.8125,32.4063 255.5,33.4844 Q256.1875,34.5469 257.5313,34.5469 Q258.1563,34.5469 258.75,34.2813 Q259.3438,34 259.9688,33.4219 L259.9688,36.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="34.6543">A</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="288" y="23.6387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="46.5" y2="46.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="54.5" y2="54.5"/>
-    <rect fill="#FEFECE" filter="url(#f1a47wrlwfbjps)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
+    <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
     <ellipse cx="398" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M400.9688,36.1406 Q400.3906,36.4375 399.75,36.5781 Q399.1094,36.7344 398.4063,36.7344 Q395.9063,36.7344 394.5781,35.0938 Q393.2656,33.4375 393.2656,30.3125 Q393.2656,27.1875 394.5781,25.5313 Q395.9063,23.875 398.4063,23.875 Q399.1094,23.875 399.75,24.0313 Q400.4063,24.1875 400.9688,24.4844 L400.9688,27.2031 Q400.3438,26.625 399.75,26.3594 Q399.1563,26.0781 398.5313,26.0781 Q397.1875,26.0781 396.5,27.1563 Q395.8125,28.2188 395.8125,30.3125 Q395.8125,32.4063 396.5,33.4844 Q397.1875,34.5469 398.5313,34.5469 Q399.1563,34.5469 399.75,34.2813 Q400.3438,34 400.9688,33.4219 L400.9688,36.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="412" y="34.6543">B</text>
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 62826002..7d93b5d0 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:749px;height:645px;" version="1.1" viewBox="0 0 749 645" width="749px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1u2qfd5rgqtiu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ee000erqki9x" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1u2qfd5rgqtiu)" points="22,24,122,24,129,46.2969,455,46.2969,455,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ee000erqki9x)" points="22,24,122,24,129,46.2969,455,46.2969,455,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1u2qfd5rgqtiu)" points="479,24,597,24,604,46.2969,727,46.2969,727,518.5,479,518.5,479,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1ee000erqki9x)" points="479,24,597,24,604,46.2969,727,46.2969,727,518.5,479,518.5,479,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="479" x2="604" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="483" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="220" y="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="220" y="569"/>
       <ellipse cx="235" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M237.9688,590.6406 Q237.3906,590.9375 236.75,591.0781 Q236.1094,591.2344 235.4063,591.2344 Q232.9063,591.2344 231.5781,589.5938 Q230.2656,587.9375 230.2656,584.8125 Q230.2656,581.6875 231.5781,580.0313 Q232.9063,578.375 235.4063,578.375 Q236.1094,578.375 236.75,578.5313 Q237.4063,578.6875 237.9688,578.9844 L237.9688,581.7031 Q237.3438,581.125 236.75,580.8594 Q236.1563,580.5781 235.5313,580.5781 Q234.1875,580.5781 233.5,581.6563 Q232.8125,582.7188 232.8125,584.8125 Q232.8125,586.9063 233.5,587.9844 Q234.1875,589.0469 235.5313,589.0469 Q236.1563,589.0469 236.75,588.7813 Q237.3438,588.5 237.9688,587.9219 L237.9688,590.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="249" y="589.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="259" y1="601" y2="601"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="259" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="259.5" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="259.5" y="448"/>
       <ellipse cx="340.75" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M343.7188,469.6406 Q343.1406,469.9375 342.5,470.0781 Q341.8594,470.2344 341.1563,470.2344 Q338.6563,470.2344 337.3281,468.5938 Q336.0156,466.9375 336.0156,463.8125 Q336.0156,460.6875 337.3281,459.0313 Q338.6563,457.375 341.1563,457.375 Q341.8594,457.375 342.5,457.5313 Q343.1563,457.6875 343.7188,457.9844 L343.7188,460.7031 Q343.0938,460.125 342.5,459.8594 Q341.9063,459.5781 341.2813,459.5781 Q339.9375,459.5781 339.25,460.6563 Q338.5625,461.7188 338.5625,463.8125 Q338.5625,465.9063 339.25,466.9844 Q339.9375,468.0469 341.2813,468.0469 Q341.9063,468.0469 342.5,467.7813 Q343.0938,467.5 343.7188,466.9219 L343.7188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="361.25" y="468.1543">B</text>
@@ -33,8 +33,8 @@
       <ellipse cx="270.5" cy="499" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="279.5" y="502.2104">b(dependants::A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="38" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="38" y="448"/>
       <ellipse cx="118.75" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M121.7188,469.6406 Q121.1406,469.9375 120.5,470.0781 Q119.8594,470.2344 119.1563,470.2344 Q116.6563,470.2344 115.3281,468.5938 Q114.0156,466.9375 114.0156,463.8125 Q114.0156,460.6875 115.3281,459.0313 Q116.6563,457.375 119.1563,457.375 Q119.8594,457.375 120.5,457.5313 Q121.1563,457.6875 121.7188,457.9844 L121.7188,460.7031 Q121.0938,460.125 120.5,459.8594 Q119.9063,459.5781 119.2813,459.5781 Q117.9375,459.5781 117.25,460.6563 Q116.5625,461.7188 116.5625,463.8125 Q116.5625,465.9063 117.25,466.9844 Q117.9375,468.0469 119.2813,468.0469 Q119.9063,468.0469 120.5,467.7813 Q121.0938,467.5 121.7188,466.9219 L121.7188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="139.25" y="468.1543">BB</text>
@@ -43,8 +43,8 @@
       <ellipse cx="49" cy="499" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="58" y="502.2104">bb(dependants::A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="236.5" y="320.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="236.5" y="320.5"/>
       <ellipse cx="317.75" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M320.7188,342.1406 Q320.1406,342.4375 319.5,342.5781 Q318.8594,342.7344 318.1563,342.7344 Q315.6563,342.7344 314.3281,341.0938 Q313.0156,339.4375 313.0156,336.3125 Q313.0156,333.1875 314.3281,331.5313 Q315.6563,329.875 318.1563,329.875 Q318.8594,329.875 319.5,330.0313 Q320.1563,330.1875 320.7188,330.4844 L320.7188,333.2031 Q320.0938,332.625 319.5,332.3594 Q318.9063,332.0781 318.2813,332.0781 Q316.9375,332.0781 316.25,333.1563 Q315.5625,334.2188 315.5625,336.3125 Q315.5625,338.4063 316.25,339.4844 Q316.9375,340.5469 318.2813,340.5469 Q318.9063,340.5469 319.5,340.2813 Q320.0938,340 320.7188,339.4219 L320.7188,342.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338.25" y="340.6543">C</text>
@@ -53,8 +53,8 @@
       <ellipse cx="247.5" cy="371.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="256.5" y="374.7104">c(dependants::B * b) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="202" x="97" y="180"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="202" x="97" y="180"/>
       <ellipse cx="189.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.2188,201.6406 Q191.6406,201.9375 191,202.0781 Q190.3594,202.2344 189.6563,202.2344 Q187.1563,202.2344 185.8281,200.5938 Q184.5156,198.9375 184.5156,195.8125 Q184.5156,192.6875 185.8281,191.0313 Q187.1563,189.375 189.6563,189.375 Q190.3594,189.375 191,189.5313 Q191.6563,189.6875 192.2188,189.9844 L192.2188,192.7031 Q191.5938,192.125 191,191.8594 Q190.4063,191.5781 189.7813,191.5781 Q188.4375,191.5781 187.75,192.6563 Q187.0625,193.7188 187.0625,195.8125 Q187.0625,197.9063 187.75,198.9844 Q188.4375,200.0469 189.7813,200.0469 Q190.4063,200.0469 191,199.7813 Q191.5938,199.5 192.2188,198.9219 L192.2188,201.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.75" y="200.1543">D</text>
@@ -65,8 +65,8 @@
       <ellipse cx="108" cy="243.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="117" y="247.0151">dd(dependants::BB * bb) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L24" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="180" x="108" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L24" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="180" x="108" y="59"/>
       <ellipse cx="189.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.7188,80.6406 Q192.1406,80.9375 191.5,81.0781 Q190.8594,81.2344 190.1563,81.2344 Q187.6563,81.2344 186.3281,79.5938 Q185.0156,77.9375 185.0156,74.8125 Q185.0156,71.6875 186.3281,70.0313 Q187.6563,68.375 190.1563,68.375 Q190.8594,68.375 191.5,68.5313 Q192.1563,68.6875 192.7188,68.9844 L192.7188,71.7031 Q192.0938,71.125 191.5,70.8594 Q190.9063,70.5781 190.2813,70.5781 Q188.9375,70.5781 188.25,71.6563 Q187.5625,72.7188 187.5625,74.8125 Q187.5625,76.9063 188.25,77.9844 Q188.9375,79.0469 190.2813,79.0469 Q190.9063,79.0469 191.5,78.7813 Q192.0938,78.5 192.7188,77.9219 L192.7188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="210.25" y="79.1543">E</text>
@@ -75,24 +75,24 @@
       <ellipse cx="119" cy="110" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="128" y="113.2104">e(dependants::D * d) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="541.5" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="541.5" y="454.5"/>
       <ellipse cx="556.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M559.4688,476.1406 Q558.8906,476.4375 558.25,476.5781 Q557.6094,476.7344 556.9063,476.7344 Q554.4063,476.7344 553.0781,475.0938 Q551.7656,473.4375 551.7656,470.3125 Q551.7656,467.1875 553.0781,465.5313 Q554.4063,463.875 556.9063,463.875 Q557.6094,463.875 558.25,464.0313 Q558.9063,464.1875 559.4688,464.4844 L559.4688,467.2031 Q558.8438,466.625 558.25,466.3594 Q557.6563,466.0781 557.0313,466.0781 Q555.6875,466.0781 555,467.1563 Q554.3125,468.2188 554.3125,470.3125 Q554.3125,472.4063 555,473.4844 Q555.6875,474.5469 557.0313,474.5469 Q557.6563,474.5469 558.25,474.2813 Q558.8438,474 559.4688,473.4219 L559.4688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="570.5" y="474.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="542.5" x2="581.5" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="542.5" x2="581.5" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L37" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="618" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L37" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="618" y="454.5"/>
       <ellipse cx="633" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M635.9688,476.1406 Q635.3906,476.4375 634.75,476.5781 Q634.1094,476.7344 633.4063,476.7344 Q630.9063,476.7344 629.5781,475.0938 Q628.2656,473.4375 628.2656,470.3125 Q628.2656,467.1875 629.5781,465.5313 Q630.9063,463.875 633.4063,463.875 Q634.1094,463.875 634.75,464.0313 Q635.4063,464.1875 635.9688,464.4844 L635.9688,467.2031 Q635.3438,466.625 634.75,466.3594 Q634.1563,466.0781 633.5313,466.0781 Q632.1875,466.0781 631.5,467.1563 Q630.8125,468.2188 630.8125,470.3125 Q630.8125,472.4063 631.5,473.4844 Q632.1875,474.5469 633.5313,474.5469 Q634.1563,474.5469 634.75,474.2813 Q635.3438,474 635.9688,473.4219 L635.9688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="647" y="474.6543">GG</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="619" x2="667" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="619" x2="667" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L40" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L40" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="495" y="314"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L40" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L40" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="495" y="314"/>
       <ellipse cx="594.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.2188,335.6406 Q596.6406,335.9375 596,336.0781 Q595.3594,336.2344 594.6563,336.2344 Q592.1563,336.2344 590.8281,334.5938 Q589.5156,332.9375 589.5156,329.8125 Q589.5156,326.6875 590.8281,325.0313 Q592.1563,323.375 594.6563,323.375 Q595.3594,323.375 596,323.5313 Q596.6563,323.6875 597.2188,323.9844 L597.2188,326.7031 Q596.5938,326.125 596,325.8594 Q595.4063,325.5781 594.7813,325.5781 Q593.4375,325.5781 592.75,326.6563 Q592.0625,327.7188 592.0625,329.8125 Q592.0625,331.9063 592.75,332.9844 Q593.4375,334.0469 594.7813,334.0469 Q595.4063,334.0469 596,333.7813 Q596.5938,333.5 597.2188,332.9219 L597.2188,335.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="614.75" y="334.1543">H</text>
@@ -103,8 +103,8 @@
       <ellipse cx="506" cy="377.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="515" y="381.0151">hh(dependencies::GG * gg) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L49" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="509" y="186.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L49" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="509" y="186.5"/>
       <ellipse cx="597.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M600.2188,208.1406 Q599.6406,208.4375 599,208.5781 Q598.3594,208.7344 597.6563,208.7344 Q595.1563,208.7344 593.8281,207.0938 Q592.5156,205.4375 592.5156,202.3125 Q592.5156,199.1875 593.8281,197.5313 Q595.1563,195.875 597.6563,195.875 Q598.3594,195.875 599,196.0313 Q599.6563,196.1875 600.2188,196.4844 L600.2188,199.2031 Q599.5938,198.625 599,198.3594 Q598.4063,198.0781 597.7813,198.0781 Q596.4375,198.0781 595.75,199.1563 Q595.0625,200.2188 595.0625,202.3125 Q595.0625,204.4063 595.75,205.4844 Q596.4375,206.5469 597.7813,206.5469 Q598.4063,206.5469 599,206.2813 Q599.5938,206 600.2188,205.4219 L600.2188,208.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="617.75" y="206.6543">I</text>
@@ -113,8 +113,8 @@
       <ellipse cx="520" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="529" y="240.7104">i(dependencies::H * h) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L53" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00043/t00043.cc#L53" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1u2qfd5rgqtiu)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="513.5" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L53" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L53" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="513.5" y="59"/>
       <ellipse cx="597.25" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M600.2188,80.6406 Q599.6406,80.9375 599,81.0781 Q598.3594,81.2344 597.6563,81.2344 Q595.1563,81.2344 593.8281,79.5938 Q592.5156,77.9375 592.5156,74.8125 Q592.5156,71.6875 593.8281,70.0313 Q595.1563,68.375 597.6563,68.375 Q598.3594,68.375 599,68.5313 Q599.6563,68.6875 600.2188,68.9844 L600.2188,71.7031 Q599.5938,71.125 599,70.8594 Q598.4063,70.5781 597.7813,70.5781 Q596.4375,70.5781 595.75,71.6563 Q595.0625,72.7188 595.0625,74.8125 Q595.0625,76.9063 595.75,77.9844 Q596.4375,79.0469 597.7813,79.0469 Q598.4063,79.0469 599,78.7813 Q599.5938,78.5 600.2188,77.9219 L600.2188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="617.75" y="79.1543">J</text>
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index ea95c52f..94d5d9c0 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="327px" preserveAspectRatio="none" style="width:2532px;height:327px;" version="1.1" viewBox="0 0 2532 327" width="2532px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fq2507l88qvjy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzc54eofmh09e" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,7 +9,7 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="48" id="C_0001821770251018637091" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="1422" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001821770251018637091" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="1422" y="159"/>
     <ellipse cx="1437" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1439.9688,180.6406 Q1439.3906,180.9375 1438.75,181.0781 Q1438.1094,181.2344 1437.4063,181.2344 Q1434.9063,181.2344 1433.5781,179.5938 Q1432.2656,177.9375 1432.2656,174.8125 Q1432.2656,171.6875 1433.5781,170.0313 Q1434.9063,168.375 1437.4063,168.375 Q1438.1094,168.375 1438.75,168.5313 Q1439.4063,168.6875 1439.9688,168.9844 L1439.9688,171.7031 Q1439.3438,171.125 1438.75,170.8594 Q1438.1563,170.5781 1437.5313,170.5781 Q1436.1875,170.5781 1435.5,171.6563 Q1434.8125,172.7188 1434.8125,174.8125 Q1434.8125,176.9063 1435.5,177.9844 Q1436.1875,179.0469 1437.5313,179.0469 Q1438.1563,179.0469 1438.75,178.7813 Q1439.3438,178.5 1439.9688,177.9219 L1439.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="1451" y="179.1543">signal_handler</text>
@@ -17,8 +17,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="12" x="1551" y="168.1387">,A</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1423" x2="1560" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1423" x2="1560" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="73.6094" id="C_0000427079823582703514" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="73.6094" id="C_0000427079823582703514" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="6" y="8"/>
       <ellipse cx="569.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M572.7188,29.6406 Q572.1406,29.9375 571.5,30.0781 Q570.8594,30.2344 570.1563,30.2344 Q567.6563,30.2344 566.3281,28.5938 Q565.0156,26.9375 565.0156,23.8125 Q565.0156,20.6875 566.3281,19.0313 Q567.6563,17.375 570.1563,17.375 Q570.8594,17.375 571.5,17.5313 Q572.1563,17.6875 572.7188,17.9844 L572.7188,20.7031 Q572.0938,20.125 571.5,19.8594 Q570.9063,19.5781 570.2813,19.5781 Q568.9375,19.5781 568.25,20.6563 Q567.5625,21.7188 567.5625,23.8125 Q567.5625,25.9063 568.25,26.9844 Q568.9375,28.0469 570.2813,28.0469 Q570.9063,28.0469 571.5,27.7813 Q572.0938,27.5 572.7188,26.9219 L572.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="590.25" y="28.1543">sink</text>
@@ -27,15 +27,15 @@
       <ellipse cx="17" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="1135" x="26" y="62.2104">sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...), type-parameter-0-2&gt; &gt;(sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t &amp; sh) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="608" x="26" y="75.0151">signal : sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="73.6094" id="C_0001813783008369291713" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="1202" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="73.6094" id="C_0001813783008369291713" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="1202" y="8"/>
       <ellipse cx="1587.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1590.2188,29.6406 Q1589.6406,29.9375 1589,30.0781 Q1588.3594,30.2344 1587.6563,30.2344 Q1585.1563,30.2344 1583.8281,28.5938 Q1582.5156,26.9375 1582.5156,23.8125 Q1582.5156,20.6875 1583.8281,19.0313 Q1585.1563,17.375 1587.6563,17.375 Q1588.3594,17.375 1589,17.5313 Q1589.6563,17.6875 1590.2188,17.9844 L1590.2188,20.7031 Q1589.5938,20.125 1589,19.8594 Q1588.4063,19.5781 1587.7813,19.5781 Q1586.4375,19.5781 1585.75,20.6563 Q1585.0625,21.7188 1585.0625,23.8125 Q1585.0625,25.9063 1585.75,26.9844 Q1586.4375,28.0469 1587.7813,28.0469 Q1588.4063,28.0469 1589,27.7813 Q1589.5938,27.5 1590.2188,26.9219 L1590.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="1607.75" y="28.1543">sink</text>
@@ -46,23 +46,23 @@
       <ellipse cx="1213" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="1135" x="1222" y="62.2104">sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...), type-parameter-0-2&gt; &gt;(sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t &amp; sh) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1208" y="66.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1210" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="608" x="1222" y="75.0151">signal : sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="48" id="C_0001971467667171416814" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="2398" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001971467667171416814" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="2398" y="21"/>
       <ellipse cx="2413" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2415.9688,42.6406 Q2415.3906,42.9375 2414.75,43.0781 Q2414.1094,43.2344 2413.4063,43.2344 Q2410.9063,43.2344 2409.5781,41.5938 Q2408.2656,39.9375 2408.2656,36.8125 Q2408.2656,33.6875 2409.5781,32.0313 Q2410.9063,30.375 2413.4063,30.375 Q2414.1094,30.375 2414.75,30.5313 Q2415.4063,30.6875 2415.9688,30.9844 L2415.9688,33.7031 Q2415.3438,33.125 2414.75,32.8594 Q2414.1563,32.5781 2413.5313,32.5781 Q2412.1875,32.5781 2411.5,33.6563 Q2410.8125,34.7188 2410.8125,36.8125 Q2410.8125,38.9063 2411.5,39.9844 Q2412.1875,41.0469 2413.5313,41.0469 Q2414.1563,41.0469 2414.75,40.7813 Q2415.3438,40.5 2415.9688,39.9219 L2415.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="2427" y="41.1543">signal_handler</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2399" x2="2520" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2399" x2="2520" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1178" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1178" y="159"/>
       <ellipse cx="1193" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1195.9688,180.6406 Q1195.3906,180.9375 1194.75,181.0781 Q1194.1094,181.2344 1193.4063,181.2344 Q1190.9063,181.2344 1189.5781,179.5938 Q1188.2656,177.9375 1188.2656,174.8125 Q1188.2656,171.6875 1189.5781,170.0313 Q1190.9063,168.375 1193.4063,168.375 Q1194.1094,168.375 1194.75,168.5313 Q1195.4063,168.6875 1195.9688,168.9844 L1195.9688,171.7031 Q1195.3438,171.125 1194.75,170.8594 Q1194.1563,170.5781 1193.5313,170.5781 Q1192.1875,170.5781 1191.5,171.6563 Q1190.8125,172.7188 1190.8125,174.8125 Q1190.8125,176.9063 1191.5,177.9844 Q1192.1875,179.0469 1193.5313,179.0469 Q1194.1563,179.0469 1194.75,178.7813 Q1195.3438,178.5 1195.9688,177.9219 L1195.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="1207" y="179.1543">signal_handler</text>
@@ -71,8 +71,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1179" x2="1386" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1179" x2="1386" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L7" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L7" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1229.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L7" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L7" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1229.5" y="268"/>
       <ellipse cx="1244.5" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1247.4688,289.6406 Q1246.8906,289.9375 1246.25,290.0781 Q1245.6094,290.2344 1244.9063,290.2344 Q1242.4063,290.2344 1241.0781,288.5938 Q1239.7656,286.9375 1239.7656,283.8125 Q1239.7656,280.6875 1241.0781,279.0313 Q1242.4063,277.375 1244.9063,277.375 Q1245.6094,277.375 1246.25,277.5313 Q1246.9063,277.6875 1247.4688,277.9844 L1247.4688,280.7031 Q1246.8438,280.125 1246.25,279.8594 Q1245.6563,279.5781 1245.0313,279.5781 Q1243.6875,279.5781 1243,280.6563 Q1242.3125,281.7188 1242.3125,283.8125 Q1242.3125,285.9063 1243,286.9844 Q1243.6875,288.0469 1245.0313,288.0469 Q1245.6563,288.0469 1246.25,287.7813 Q1246.8438,287.5 1247.4688,286.9219 L1247.4688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="1258.5" y="288.1543">signal_handler</text>
@@ -81,8 +81,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1230.5" x2="1374.5" y1="300" y2="300"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1230.5" x2="1374.5" y1="308" y2="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L5" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00044/t00044.cc#L5" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fq2507l88qvjy)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="1748.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L5" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L5" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="1748.5" y="159"/>
       <ellipse cx="1763.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1766.4688,180.6406 Q1765.8906,180.9375 1765.25,181.0781 Q1764.6094,181.2344 1763.9063,181.2344 Q1761.4063,181.2344 1760.0781,179.5938 Q1758.7656,177.9375 1758.7656,174.8125 Q1758.7656,171.6875 1760.0781,170.0313 Q1761.4063,168.375 1763.9063,168.375 Q1764.6094,168.375 1765.25,168.5313 Q1765.9063,168.6875 1766.4688,168.9844 L1766.4688,171.7031 Q1765.8438,171.125 1765.25,170.8594 Q1764.6563,170.5781 1764.0313,170.5781 Q1762.6875,170.5781 1762,171.6563 Q1761.3125,172.7188 1761.3125,174.8125 Q1761.3125,176.9063 1762,177.9844 Q1762.6875,179.0469 1764.0313,179.0469 Q1764.6563,179.0469 1765.25,178.7813 Q1765.8438,178.5 1766.4688,177.9219 L1766.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="1777.5" y="179.1543">sink</text>
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index c047593e..89f15c3d 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvfneg3gjfjyb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1bso9u27ude8w" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,32 +9,32 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
       <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
       <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L7" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L7" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
       <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L10" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L10" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L10" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L10" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
       <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
@@ -42,103 +42,103 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="464.5" y="42.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="71.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="79.7104">t : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="86.3047" y2="86.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L16" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L16" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L16" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L16" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
       <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
       <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
       <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
       <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L30" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L30" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L30" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L30" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
       <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
       <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
       <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L39" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L39" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvfneg3gjfjyb)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L39" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L39" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
       <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
       <ellipse cx="196" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="205" y="54.2104">a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="58.8047"/>
       <ellipse cx="196" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="67.0151">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="71.6094"/>
       <ellipse cx="196" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="79.8198">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="84.4141"/>
       <ellipse cx="196" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="92.6245">root_a : ::A *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index 91d5ee80..f3548188 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="619px" preserveAspectRatio="none" style="width:684px;height:619px;" version="1.1" viewBox="0 0 684 619" width="684px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pkkrrz6rjq7z" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzk68rc5wvltj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,118 +9,118 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1pkkrrz6rjq7z)" points="120,24.5,155,24.5,162,46.7969,534,46.7969,534,607,120,607,120,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fzk68rc5wvltj)" points="120,24.5,155,24.5,162,46.7969,534,46.7969,534,607,120,607,120,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="120" x2="162" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="124" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pkkrrz6rjq7z)" points="144,173,179,173,186,195.2969,510,195.2969,510,583,144,583,144,173" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fzk68rc5wvltj)" points="144,173,179,173,186,195.2969,510,195.2969,510,583,144,583,144,173" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="144" x2="186" y1="195.2969" y2="195.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="148" y="187.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1pkkrrz6rjq7z)" points="6,57,90,57,97,79.2969,104,79.2969,104,109.5938,6,109.5938,6,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fzk68rc5wvltj)" points="6,57,90,57,97,79.2969,104,79.2969,104,109.5938,6,109.5938,6,57" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="97" y1="79.2969" y2="79.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="78" x="10" y="71.9951">__gnu_cxx</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="206" y="59.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="206" y="59.5"/>
       <ellipse cx="221" cy="75.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.9688,81.1406 Q223.3906,81.4375 222.75,81.5781 Q222.1094,81.7344 221.4063,81.7344 Q218.9063,81.7344 217.5781,80.0938 Q216.2656,78.4375 216.2656,75.3125 Q216.2656,72.1875 217.5781,70.5313 Q218.9063,68.875 221.4063,68.875 Q222.1094,68.875 222.75,69.0313 Q223.4063,69.1875 223.9688,69.4844 L223.9688,72.2031 Q223.3438,71.625 222.75,71.3594 Q222.1563,71.0781 221.5313,71.0781 Q220.1875,71.0781 219.5,72.1563 Q218.8125,73.2188 218.8125,75.3125 Q218.8125,77.4063 219.5,78.4844 Q220.1875,79.5469 221.5313,79.5469 Q222.1563,79.5469 222.75,79.2813 Q223.3438,79 223.9688,78.4219 L223.9688,81.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="235" y="79.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="207" x2="245" y1="91.5" y2="91.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="207" x2="245" y1="99.5" y2="99.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="306" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="306" y="410"/>
       <ellipse cx="321" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M323.9688,431.6406 Q323.3906,431.9375 322.75,432.0781 Q322.1094,432.2344 321.4063,432.2344 Q318.9063,432.2344 317.5781,430.5938 Q316.2656,428.9375 316.2656,425.8125 Q316.2656,422.6875 317.5781,421.0313 Q318.9063,419.375 321.4063,419.375 Q322.1094,419.375 322.75,419.5313 Q323.4063,419.6875 323.9688,419.9844 L323.9688,422.7031 Q323.3438,422.125 322.75,421.8594 Q322.1563,421.5781 321.5313,421.5781 Q320.1875,421.5781 319.5,422.6563 Q318.8125,423.7188 318.8125,425.8125 Q318.8125,427.9063 319.5,428.9844 Q320.1875,430.0469 321.5313,430.0469 Q322.1563,430.0469 322.75,429.7813 Q323.3438,429.5 323.9688,428.9219 L323.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="335" y="430.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="307" x2="345" y1="442" y2="442"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="307" x2="345" y1="450" y2="450"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L20" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="276" y="519"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L20" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="276" y="519"/>
       <ellipse cx="291" cy="535" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M293.9688,540.6406 Q293.3906,540.9375 292.75,541.0781 Q292.1094,541.2344 291.4063,541.2344 Q288.9063,541.2344 287.5781,539.5938 Q286.2656,537.9375 286.2656,534.8125 Q286.2656,531.6875 287.5781,530.0313 Q288.9063,528.375 291.4063,528.375 Q292.1094,528.375 292.75,528.5313 Q293.4063,528.6875 293.9688,528.9844 L293.9688,531.7031 Q293.3438,531.125 292.75,530.8594 Q292.1563,530.5781 291.5313,530.5781 Q290.1875,530.5781 289.5,531.6563 Q288.8125,532.7188 288.8125,534.8125 Q288.8125,536.9063 289.5,537.9844 Q290.1875,539.0469 291.5313,539.0469 Q292.1563,539.0469 292.75,538.7813 Q293.3438,538.5 293.9688,537.9219 L293.9688,540.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="305" y="539.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="315" y1="551" y2="551"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="315" y1="559" y2="559"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="160" y="246.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="160" y="246.5"/>
       <ellipse cx="175" cy="262.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M177.9688,268.1406 Q177.3906,268.4375 176.75,268.5781 Q176.1094,268.7344 175.4063,268.7344 Q172.9063,268.7344 171.5781,267.0938 Q170.2656,265.4375 170.2656,262.3125 Q170.2656,259.1875 171.5781,257.5313 Q172.9063,255.875 175.4063,255.875 Q176.1094,255.875 176.75,256.0313 Q177.4063,256.1875 177.9688,256.4844 L177.9688,259.2031 Q177.3438,258.625 176.75,258.3594 Q176.1563,258.0781 175.5313,258.0781 Q174.1875,258.0781 173.5,259.1563 Q172.8125,260.2188 172.8125,262.3125 Q172.8125,264.4063 173.5,265.4844 Q174.1875,266.5469 175.5313,266.5469 Q176.1563,266.5469 176.75,266.2813 Q177.3438,266 177.9688,265.4219 L177.9688,268.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="189" y="266.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="199" y1="278.5" y2="278.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="199" y1="286.5" y2="286.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L26" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="351.5" y="519"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L26" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="351.5" y="519"/>
       <ellipse cx="366.5" cy="535" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M369.4688,540.6406 Q368.8906,540.9375 368.25,541.0781 Q367.6094,541.2344 366.9063,541.2344 Q364.4063,541.2344 363.0781,539.5938 Q361.7656,537.9375 361.7656,534.8125 Q361.7656,531.6875 363.0781,530.0313 Q364.4063,528.375 366.9063,528.375 Q367.6094,528.375 368.25,528.5313 Q368.9063,528.6875 369.4688,528.9844 L369.4688,531.7031 Q368.8438,531.125 368.25,530.8594 Q367.6563,530.5781 367.0313,530.5781 Q365.6875,530.5781 365,531.6563 Q364.3125,532.7188 364.3125,534.8125 Q364.3125,536.9063 365,537.9844 Q365.6875,539.0469 367.0313,539.0469 Q367.6563,539.0469 368.25,538.7813 Q368.8438,538.5 369.4688,537.9219 L369.4688,540.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="380.5" y="539.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352.5" x2="391.5" y1="551" y2="551"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352.5" x2="391.5" y1="559" y2="559"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="454" y="246.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="454" y="246.5"/>
       <ellipse cx="469" cy="262.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M471.9688,268.1406 Q471.3906,268.4375 470.75,268.5781 Q470.1094,268.7344 469.4063,268.7344 Q466.9063,268.7344 465.5781,267.0938 Q464.2656,265.4375 464.2656,262.3125 Q464.2656,259.1875 465.5781,257.5313 Q466.9063,255.875 469.4063,255.875 Q470.1094,255.875 470.75,256.0313 Q471.4063,256.1875 471.9688,256.4844 L471.9688,259.2031 Q471.3438,258.625 470.75,258.3594 Q470.1563,258.0781 469.5313,258.0781 Q468.1875,258.0781 467.5,259.1563 Q466.8125,260.2188 466.8125,262.3125 Q466.8125,264.4063 467.5,265.4844 Q468.1875,266.5469 469.5313,266.5469 Q470.1563,266.5469 470.75,266.2813 Q471.3438,266 471.9688,265.4219 L471.9688,268.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="483" y="266.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="493" y1="278.5" y2="278.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="493" y1="286.5" y2="286.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="235" y="208"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="235" y="208"/>
       <ellipse cx="318.75" cy="224" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M321.7188,229.6406 Q321.1406,229.9375 320.5,230.0781 Q319.8594,230.2344 319.1563,230.2344 Q316.6563,230.2344 315.3281,228.5938 Q314.0156,226.9375 314.0156,223.8125 Q314.0156,220.6875 315.3281,219.0313 Q316.6563,217.375 319.1563,217.375 Q319.8594,217.375 320.5,217.5313 Q321.1563,217.6875 321.7188,217.9844 L321.7188,220.7031 Q321.0938,220.125 320.5,219.8594 Q319.9063,219.5781 319.2813,219.5781 Q317.9375,219.5781 317.25,220.6563 Q316.5625,221.7188 316.5625,223.8125 Q316.5625,225.9063 317.25,226.9844 Q317.9375,228.0469 319.2813,228.0469 Q319.9063,228.0469 320.5,227.7813 Q321.0938,227.5 321.7188,226.9219 L321.7188,229.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339.25" y="228.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="418" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="246"/>
       <ellipse cx="246" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="255" y="254.2104">a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="258.8047"/>
       <ellipse cx="246" cy="263.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="255" y="267.0151">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="271.6094"/>
       <ellipse cx="246" cy="276.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="255" y="279.8198">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="284.4141"/>
       <ellipse cx="246" cy="289.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="255" y="292.6245">root_a : ::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="297.2188"/>
       <ellipse cx="246" cy="302.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="255" y="305.4292">i : std::vector&lt;std::uint8_t&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="418" y1="312.0234" y2="312.0234"/>
     <ellipse cx="246" cy="323.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="255" y="326.2339">foo(AA &amp; aa) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="633" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="633" y="410"/>
       <ellipse cx="648" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M650.9688,431.6406 Q650.3906,431.9375 649.75,432.0781 Q649.1094,432.2344 648.4063,432.2344 Q645.9063,432.2344 644.5781,430.5938 Q643.2656,428.9375 643.2656,425.8125 Q643.2656,422.6875 644.5781,421.0313 Q645.9063,419.375 648.4063,419.375 Q649.1094,419.375 649.75,419.5313 Q650.4063,419.6875 650.9688,419.9844 L650.9688,422.7031 Q650.3438,422.125 649.75,421.8594 Q649.1563,421.5781 648.5313,421.5781 Q647.1875,421.5781 646.5,422.6563 Q645.8125,423.7188 645.8125,425.8125 Q645.8125,427.9063 646.5,428.9844 Q647.1875,430.0469 648.5313,430.0469 Q649.1563,430.0469 649.75,429.7813 Q650.3438,429.5 650.9688,428.9219 L650.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="662" y="430.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="634" x2="672" y1="442" y2="442"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="634" x2="672" y1="450" y2="450"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L7" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00046/t00046.cc#L7" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pkkrrz6rjq7z)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="550" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L7" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L7" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="550" y="410"/>
       <ellipse cx="565" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M567.9688,431.6406 Q567.3906,431.9375 566.75,432.0781 Q566.1094,432.2344 565.4063,432.2344 Q562.9063,432.2344 561.5781,430.5938 Q560.2656,428.9375 560.2656,425.8125 Q560.2656,422.6875 561.5781,421.0313 Q562.9063,419.375 565.4063,419.375 Q566.1094,419.375 566.75,419.5313 Q567.4063,419.6875 567.9688,419.9844 L567.9688,422.7031 Q567.3438,422.125 566.75,421.8594 Q566.1563,421.5781 565.5313,421.5781 Q564.1875,421.5781 563.5,422.6563 Q562.8125,423.7188 562.8125,425.8125 Q562.8125,427.9063 563.5,428.9844 Q564.1875,430.0469 565.5313,430.0469 Q566.1563,430.0469 566.75,429.7813 Q567.3438,429.5 567.9688,428.9219 L567.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="579" y="430.1543">AA</text>
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index 26a0f5a0..ee9de4c0 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:946px;height:175px;" version="1.1" viewBox="0 0 946 175" width="946px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1di42d4imsd9v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fekzz09dqtn0u" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1di42d4imsd9v)" height="48" id="C_0000780206187563989609" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000780206187563989609" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="117" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="117" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1di42d4imsd9v)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="153.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="153.5" y="8"/>
       <ellipse cx="168.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M171.4688,29.6406 Q170.8906,29.9375 170.25,30.0781 Q169.6094,30.2344 168.9063,30.2344 Q166.4063,30.2344 165.0781,28.5938 Q163.7656,26.9375 163.7656,23.8125 Q163.7656,20.6875 165.0781,19.0313 Q166.4063,17.375 168.9063,17.375 Q169.6094,17.375 170.25,17.5313 Q170.9063,17.6875 171.4688,17.9844 L171.4688,20.7031 Q170.8438,20.125 170.25,19.8594 Q169.6563,19.5781 169.0313,19.5781 Q167.6875,19.5781 167,20.6563 Q166.3125,21.7188 166.3125,23.8125 Q166.3125,25.9063 167,26.9844 Q167.6875,28.0469 169.0313,28.0469 Q169.6563,28.0469 170.25,27.7813 Q170.8438,27.5 171.4688,26.9219 L171.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="182.5" y="28.1543">conditional_t</text>
@@ -27,8 +27,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="154.5" x2="293.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="154.5" x2="293.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1di42d4imsd9v)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="330" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="330" y="8"/>
       <ellipse cx="345" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M347.9688,29.6406 Q347.3906,29.9375 346.75,30.0781 Q346.1094,30.2344 345.4063,30.2344 Q342.9063,30.2344 341.5781,28.5938 Q340.2656,26.9375 340.2656,23.8125 Q340.2656,20.6875 341.5781,19.0313 Q342.9063,17.375 345.4063,17.375 Q346.1094,17.375 346.75,17.5313 Q347.4063,17.6875 347.9688,17.9844 L347.9688,20.7031 Q347.3438,20.125 346.75,19.8594 Q346.1563,19.5781 345.5313,19.5781 Q344.1875,19.5781 343.5,20.6563 Q342.8125,21.7188 342.8125,23.8125 Q342.8125,25.9063 343.5,26.9844 Q344.1875,28.0469 345.5313,28.0469 Q346.1563,28.0469 346.75,27.7813 Q347.3438,27.5 347.9688,26.9219 L347.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="359" y="28.1543">conditional_t</text>
@@ -37,8 +37,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="331" x2="611" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="331" x2="611" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1di42d4imsd9v)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="647.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="647.5" y="8"/>
       <ellipse cx="662.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M665.4688,29.6406 Q664.8906,29.9375 664.25,30.0781 Q663.6094,30.2344 662.9063,30.2344 Q660.4063,30.2344 659.0781,28.5938 Q657.7656,26.9375 657.7656,23.8125 Q657.7656,20.6875 659.0781,19.0313 Q660.4063,17.375 662.9063,17.375 Q663.6094,17.375 664.25,17.5313 Q664.9063,17.6875 665.4688,17.9844 L665.4688,20.7031 Q664.8438,20.125 664.25,19.8594 Q663.6563,19.5781 663.0313,19.5781 Q661.6875,19.5781 661,20.6563 Q660.3125,21.7188 660.3125,23.8125 Q660.3125,25.9063 661,26.9844 Q661.6875,28.0469 663.0313,28.0469 Q663.6563,28.0469 664.25,27.7813 Q664.8438,27.5 665.4688,26.9219 L665.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="676.5" y="28.1543">conditional_t</text>
@@ -47,8 +47,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648.5" x2="931.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648.5" x2="931.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1di42d4imsd9v)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="400.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="400.5" y="116"/>
       <ellipse cx="415.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M418.4688,137.6406 Q417.8906,137.9375 417.25,138.0781 Q416.6094,138.2344 415.9063,138.2344 Q413.4063,138.2344 412.0781,136.5938 Q410.7656,134.9375 410.7656,131.8125 Q410.7656,128.6875 412.0781,127.0313 Q413.4063,125.375 415.9063,125.375 Q416.6094,125.375 417.25,125.5313 Q417.9063,125.6875 418.4688,125.9844 L418.4688,128.7031 Q417.8438,128.125 417.25,127.8594 Q416.6563,127.5781 416.0313,127.5781 Q414.6875,127.5781 414,128.6563 Q413.3125,129.7188 413.3125,131.8125 Q413.3125,133.9063 414,134.9844 Q414.6875,136.0469 416.0313,136.0469 Q416.6563,136.0469 417.25,135.7813 Q417.8438,135.5 418.4688,134.9219 L418.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="429.5" y="136.1543">conditional_t</text>
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index 869471b0..cd9f6346 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fu7f7uptumpsy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15p2adrxbjoc4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu7f7uptumpsy)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
       <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
       <ellipse cx="92.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="54.2104">base : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
     <ellipse cx="92.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="75.0151">foo() = 0 : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu7f7uptumpsy)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
       <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
@@ -35,35 +35,35 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
       <ellipse cx="295" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="54.2104">base : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
     <ellipse cx="295" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="75.0151">foo() = 0 : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu7f7uptumpsy)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
       <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
       <ellipse cx="17" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="188.2104">b : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
     <ellipse cx="17" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu7f7uptumpsy)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
       <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
@@ -71,35 +71,35 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
       <ellipse cx="273" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="188.2104">b : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
     <ellipse cx="273" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu7f7uptumpsy)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
       <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
       <ellipse cx="139" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="188.2104">a : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
     <ellipse cx="139" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu7f7uptumpsy)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
       <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
@@ -107,11 +107,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
       <ellipse cx="417" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="188.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index d265452e..632fa443 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:416px;height:390px;" version="1.1" viewBox="0 0 416 390" width="416px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1d6t2wg14robx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flhdusuru3g27" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6t2wg14robx)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="144.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="144.5" y="306"/>
       <ellipse cx="180.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M183.6188,327.6406 Q183.0406,327.9375 182.4,328.0781 Q181.7594,328.2344 181.0563,328.2344 Q178.5563,328.2344 177.2281,326.5938 Q175.9156,324.9375 175.9156,321.8125 Q175.9156,318.6875 177.2281,317.0313 Q178.5563,315.375 181.0563,315.375 Q181.7594,315.375 182.4,315.5313 Q183.0563,315.6875 183.6188,315.9844 L183.6188,318.7031 Q182.9938,318.125 182.4,317.8594 Q181.8063,317.5781 181.1813,317.5781 Q179.8375,317.5781 179.15,318.6563 Q178.4625,319.7188 178.4625,321.8125 Q178.4625,323.9063 179.15,324.9844 Q179.8375,326.0469 181.1813,326.0469 Q181.8063,326.0469 182.4,325.7813 Q182.9938,325.5 183.6188,324.9219 L183.6188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="199.35" y="326.1543">A</text>
@@ -18,17 +18,17 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="237.5" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="241.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="150.5" y="344"/>
       <ellipse cx="155.5" cy="349" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="164.5" y="352.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="241.5" y1="358.8047" y2="358.8047"/>
     <ellipse cx="155.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="164.5" y="373.0151">get_a() : T &amp;</text>
-    <rect fill="#FEFECE" filter="url(#f1d6t2wg14robx)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="21" y="197"/>
+    <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="21" y="197"/>
     <ellipse cx="36" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M38.9688,218.6406 Q38.3906,218.9375 37.75,219.0781 Q37.1094,219.2344 36.4063,219.2344 Q33.9063,219.2344 32.5781,217.5938 Q31.2656,215.9375 31.2656,212.8125 Q31.2656,209.6875 32.5781,208.0313 Q33.9063,206.375 36.4063,206.375 Q37.1094,206.375 37.75,206.5313 Q38.4063,206.6875 38.9688,206.9844 L38.9688,209.7031 Q38.3438,209.125 37.75,208.8594 Q37.1563,208.5781 36.5313,208.5781 Q35.1875,208.5781 34.5,209.6563 Q33.8125,210.7188 33.8125,212.8125 Q33.8125,214.9063 34.5,215.9844 Q35.1875,217.0469 36.5313,217.0469 Q37.1563,217.0469 37.75,216.7813 Q38.3438,216.5 38.9688,215.9219 L38.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="50" y="217.1543">A</text>
@@ -36,7 +36,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="67" y="206.1387">intmap</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22" x2="107" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22" x2="107" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1d6t2wg14robx)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="143.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="143.5" y="197"/>
     <ellipse cx="158.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M161.4688,218.6406 Q160.8906,218.9375 160.25,219.0781 Q159.6094,219.2344 158.9063,219.2344 Q156.4063,219.2344 155.0781,217.5938 Q153.7656,215.9375 153.7656,212.8125 Q153.7656,209.6875 155.0781,208.0313 Q156.4063,206.375 158.9063,206.375 Q159.6094,206.375 160.25,206.5313 Q160.9063,206.6875 161.4688,206.9844 L161.4688,209.7031 Q160.8438,209.125 160.25,208.8594 Q159.6563,208.5781 159.0313,208.5781 Q157.6875,208.5781 157,209.6563 Q156.3125,210.7188 156.3125,212.8125 Q156.3125,214.9063 157,215.9844 Q157.6875,217.0469 159.0313,217.0469 Q159.6563,217.0469 160.25,216.7813 Q160.8438,216.5 161.4688,215.9219 L161.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="172.5" y="217.1543">A</text>
@@ -44,7 +44,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="189.5" y="206.1387">thestring</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="144.5" x2="242.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="144.5" x2="242.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1d6t2wg14robx)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="278.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="278.5" y="197"/>
     <ellipse cx="293.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M296.4688,218.6406 Q295.8906,218.9375 295.25,219.0781 Q294.6094,219.2344 293.9063,219.2344 Q291.4063,219.2344 290.0781,217.5938 Q288.7656,215.9375 288.7656,212.8125 Q288.7656,209.6875 290.0781,208.0313 Q291.4063,206.375 293.9063,206.375 Q294.6094,206.375 295.25,206.5313 Q295.9063,206.6875 296.4688,206.9844 L296.4688,209.7031 Q295.8438,209.125 295.25,208.8594 Q294.6563,208.5781 294.0313,208.5781 Q292.6875,208.5781 292,209.6563 Q291.3125,210.7188 291.3125,212.8125 Q291.3125,214.9063 292,215.9844 Q292.6875,217.0469 294.0313,217.0469 Q294.6563,217.0469 295.25,216.7813 Q295.8438,216.5 296.4688,215.9219 L296.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="307.5" y="217.1543">A</text>
@@ -52,32 +52,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="324.5" y="206.1387">string_vector</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="279.5" x2="401.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="279.5" x2="401.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d6t2wg14robx)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="6" y="8"/>
       <ellipse cx="135.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M138.2188,29.6406 Q137.6406,29.9375 137,30.0781 Q136.3594,30.2344 135.6563,30.2344 Q133.1563,30.2344 131.8281,28.5938 Q130.5156,26.9375 130.5156,23.8125 Q130.5156,20.6875 131.8281,19.0313 Q133.1563,17.375 135.6563,17.375 Q136.3594,17.375 137,17.5313 Q137.6563,17.6875 138.2188,17.9844 L138.2188,20.7031 Q137.5938,20.125 137,19.8594 Q136.4063,19.5781 135.7813,19.5781 Q134.4375,19.5781 133.75,20.6563 Q133.0625,21.7188 133.0625,23.8125 Q133.0625,25.9063 133.75,26.9844 Q134.4375,28.0469 135.7813,28.0469 Q136.4063,28.0469 137,27.7813 Q137.5938,27.5 138.2188,26.9219 L138.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="280" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="26" y="54.2104">a_string : A&lt;thestring&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="26" y="67.0151">a_vector_string : A&lt;string_vector&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="71.6094"/>
       <ellipse cx="17" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="26" y="79.8198">a_int_map : A&lt;intmap&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="280" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index c3ca998b..9b32c192 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fo2semalpmjo1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="frpv1bd4ay76r" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
       <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L26" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L26" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L26" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L26" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
       <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L56" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L56" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L56" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L56" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
       <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L69" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L69" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L69" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L69" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
       <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L75" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L75" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L75" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L75" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
       <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L86" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L86" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L86" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L86" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
       <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
@@ -61,44 +61,44 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="52" x="2098.5" y="365.1387">T,V,int N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="394"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="402.2104">t : T[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="406.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="408.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="415.0151">v : V</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="421.6094" y2="421.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L96" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L96" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L96" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L96" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
       <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L99" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t00050/t00050.cc#L99" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fo2semalpmjo1)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L99" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L99" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
       <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
     </a>
-    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
@@ -125,50 +125,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
-    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
-    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
-    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
-    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
-    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
-    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
-    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
-    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
-    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
-    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#fo2semalpmjo1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
@@ -181,6 +181,6 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="10" x="2110" y="115.8638">N</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="95" x="2124" y="115.8638">Size of T array.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="130.9966"/>
-    <path d="M1082.7,93.66 C1096.31,107.11 1115.51,125.1 1134,139 C1175.12,169.92 1195.7,163.57 1233,199 C1287.91,251.15 1332.5,330.1 1352.55,368.86 " fill="none" id="GMN819-C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M1082.7,93.66 C1096.31,107.11 1115.51,125.1 1134,139 C1175.12,169.92 1195.7,163.57 1233,199 C1287.91,251.15 1332.5,330.1 1352.55,368.86 " fill="none" id="GMN825-C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md
new file mode 100644
index 00000000..cb6b1e66
--- /dev/null
+++ b/docs/test_cases/t00051.md
@@ -0,0 +1,86 @@
+# t00051 - Test case for relative paths in lambda names
+## Config
+```yaml
+compilation_database_dir: ..
+output_directory: puml
+diagrams:
+  t00051_class:
+    type: class
+    glob:
+      - ../../tests/t00051/t00051.cc
+    include:
+      namespaces:
+        - clanguml::t00051
+    using_namespace:
+      - clanguml::t00051
+```
+## Source code
+File t00051.cc
+```cpp
+#include <thread>
+
+namespace clanguml {
+namespace t00051 {
+
+template <typename F, typename FF = F> struct B : private std::thread {
+    B(F &&f, FF &&ff)
+        : f_{std::move(f)}
+        , ff_{std::move(ff)}
+    {
+    }
+
+    void f() { f_(); }
+    void ff() { ff_(); }
+
+    F f_;
+    FF ff_;
+};
+
+class A {
+public:
+private:
+    class custom_thread1 : private std::thread {
+    public:
+        template <class Function, class... Args>
+        explicit custom_thread1(Function &&f, Args &&...args)
+            : std::thread::thread(
+                  std::forward<Function>(f), std::forward<Args>(args)...)
+        {
+        }
+    };
+
+    static custom_thread1 start_thread1();
+
+    class custom_thread2 : private std::thread {
+        using std::thread::thread;
+    };
+
+    static custom_thread2 start_thread2();
+
+    auto start_thread3()
+    {
+        return B{[]() {}, []() {}};
+    }
+
+    auto get_function()
+    {
+        return []() {};
+    }
+};
+
+A::custom_thread1 A::start_thread1()
+{
+    return custom_thread1{[]() {}};
+}
+
+A::custom_thread2 A::start_thread2()
+{
+    return custom_thread2{[]() {}};
+}
+
+}
+}
+
+```
+## Generated UML diagrams
+![t00051_class](./t00051_class.svg "Test case for relative paths in lambda names")
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
new file mode 100644
index 00000000..79de51fe
--- /dev/null
+++ b/docs/test_cases/t00051_class.svg
@@ -0,0 +1,119 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="583px" preserveAspectRatio="none" style="width:786px;height:583px;" version="1.1" viewBox="0 0 786 583" width="786px" zoomAndPan="magnify">
+  <defs>
+    <filter height="300%" id="f1sxn22h3dw1vc" width="300%" x="-1" y="-1">
+      <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
+      <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
+      <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
+      <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
+    </filter>
+    <style type="text/css">a:hover { text-decoration: underline; }</style>
+  </defs>
+  <g>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="112.0234" id="C_0000704524754474791953" style="stroke: #A80036; stroke-width: 1.5;" width="215" x="269.5" y="460"/>
+      <ellipse cx="354.25" cy="476" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M357.2188,481.6406 Q356.6406,481.9375 356,482.0781 Q355.3594,482.2344 354.6563,482.2344 Q352.1563,482.2344 350.8281,480.5938 Q349.5156,478.9375 349.5156,475.8125 Q349.5156,472.6875 350.8281,471.0313 Q352.1563,469.375 354.6563,469.375 Q355.3594,469.375 356,469.5313 Q356.6563,469.6875 357.2188,469.9844 L357.2188,472.7031 Q356.5938,472.125 356,471.8594 Q355.4063,471.5781 354.7813,471.5781 Q353.4375,471.5781 352.75,472.6563 Q352.0625,473.7188 352.0625,475.8125 Q352.0625,477.9063 352.75,478.9844 Q353.4375,480.0469 354.7813,480.0469 Q355.4063,480.0469 356,479.7813 Q356.5938,479.5 357.2188,478.9219 L357.2188,481.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="374.75" y="480.1543">B</text>
+      <rect fill="#FFFFFF" height="15.9688" style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" width="27" x="460.5" y="457"/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="461.5" y="469.1387">F,FF</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="483.5" y1="492" y2="492"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="275.5" y="498"/>
+      <ellipse cx="280.5" cy="503" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="289.5" y="506.2104">f_ : F</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="275.5" y="510.8047"/>
+      <ellipse cx="280.5" cy="515.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="289.5" y="519.0151">ff_ : FF</text>
+    </a>
+    <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="483.5" y1="525.6094" y2="525.6094"/>
+    <ellipse cx="280.5" cy="536.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="189" x="289.5" y="539.8198">B&lt;F, FF&gt;(F &amp;&amp; f, FF &amp;&amp; ff) : void</text>
+    <ellipse cx="280.5" cy="549.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="289.5" y="552.6245">f() : void</text>
+    <ellipse cx="280.5" cy="562.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="289.5" y="565.4292">ff() : void</text>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="112.0234" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="40.5" y="288"/>
+      <ellipse cx="69.45" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M72.4188,309.6406 Q71.8406,309.9375 71.2,310.0781 Q70.5594,310.2344 69.8563,310.2344 Q67.3563,310.2344 66.0281,308.5938 Q64.7156,306.9375 64.7156,303.8125 Q64.7156,300.6875 66.0281,299.0313 Q67.3563,297.375 69.8563,297.375 Q70.5594,297.375 71.2,297.5313 Q71.8563,297.6875 72.4188,297.9844 L72.4188,300.7031 Q71.7938,300.125 71.2,299.8594 Q70.6063,299.5781 69.9813,299.5781 Q68.6375,299.5781 67.95,300.6563 Q67.2625,301.7188 67.2625,303.8125 Q67.2625,305.9063 67.95,306.9844 Q68.6375,308.0469 69.9813,308.0469 Q70.6063,308.0469 71.2,307.7813 Q71.7938,307.5 72.4188,306.9219 L72.4188,309.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="610" x="86.55" y="308.1543">B&lt;(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)&gt;</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="712.5" y1="320" y2="320"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="712.5" y1="328" y2="328"/>
+      <ellipse cx="51.5" cy="339" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="647" x="60.5" y="342.2104">B((lambda at ../../tests/t00051/t00051.cc:43:18) &amp;&amp; f, (lambda at ../../tests/t00051/t00051.cc:43:27) &amp;&amp; ff) : void</text>
+      <ellipse cx="51.5" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="60.5" y="355.0151">f() : void</text>
+      <ellipse cx="51.5" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="60.5" y="367.8198">ff() : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="372.4141"/>
+      <ellipse cx="51.5" cy="377.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="282" x="60.5" y="380.6245">f_ : (lambda at ../../tests/t00051/t00051.cc:43:18)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="385.2188"/>
+      <ellipse cx="51.5" cy="390.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="286" x="60.5" y="393.4292">ff_ : (lambda at ../../tests/t00051/t00051.cc:43:27)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="40.5" y="129"/>
+      <ellipse cx="368.75" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M371.7188,150.6406 Q371.1406,150.9375 370.5,151.0781 Q369.8594,151.2344 369.1563,151.2344 Q366.6563,151.2344 365.3281,149.5938 Q364.0156,147.9375 364.0156,144.8125 Q364.0156,141.6875 365.3281,140.0313 Q366.6563,138.375 369.1563,138.375 Q369.8594,138.375 370.5,138.5313 Q371.1563,138.6875 371.7188,138.9844 L371.7188,141.7031 Q371.0938,141.125 370.5,140.8594 Q369.9063,140.5781 369.2813,140.5781 Q367.9375,140.5781 367.25,141.6563 Q366.5625,142.7188 366.5625,144.8125 Q366.5625,146.9063 367.25,147.9844 Q367.9375,149.0469 369.2813,149.0469 Q369.9063,149.0469 370.5,148.7813 Q371.0938,148.5 371.7188,147.9219 L371.7188,150.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="389.25" y="149.1543">A</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="712.5" y1="161" y2="161"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="41.5" x2="712.5" y1="169" y2="169"/>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="177"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="204" x="60.5" y="183.2104">start_thread1() : A::custom_thread1</text>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="189.8047"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="204" x="60.5" y="196.0151">start_thread2() : A::custom_thread2</text>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="202.6094"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="647" x="60.5" y="208.8198">start_thread3() : B&lt;(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)&gt;</text>
+      <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="215.4141"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="349" x="60.5" y="221.6245">get_function() : (lambda at ../../tests/t00051/t00051.cc:48:16)</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="340" x="6" y="8"/>
+      <ellipse cx="112.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M115.7188,29.6406 Q115.1406,29.9375 114.5,30.0781 Q113.8594,30.2344 113.1563,30.2344 Q110.6563,30.2344 109.3281,28.5938 Q108.0156,26.9375 108.0156,23.8125 Q108.0156,20.6875 109.3281,19.0313 Q110.6563,17.375 113.1563,17.375 Q113.8594,17.375 114.5,17.5313 Q115.1563,17.6875 115.7188,17.9844 L115.7188,20.7031 Q115.0938,20.125 114.5,19.8594 Q113.9063,19.5781 113.2813,19.5781 Q111.9375,19.5781 111.25,20.6563 Q110.5625,21.7188 110.5625,23.8125 Q110.5625,25.9063 111.25,26.9844 Q111.9375,28.0469 113.2813,28.0469 Q113.9063,28.0469 114.5,27.7813 Q115.0938,27.5 115.7188,26.9219 L115.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="133.25" y="28.1543">A::custom_thread1</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="345" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="345" y1="48" y2="48"/>
+      <ellipse cx="17" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="314" x="26" y="62.2104">custom_thread1(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
+    </a>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="394" x="381" y="8"/>
+      <ellipse cx="514.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
+      <path d="M517.7188,29.6406 Q517.1406,29.9375 516.5,30.0781 Q515.8594,30.2344 515.1563,30.2344 Q512.6563,30.2344 511.3281,28.5938 Q510.0156,26.9375 510.0156,23.8125 Q510.0156,20.6875 511.3281,19.0313 Q512.6563,17.375 515.1563,17.375 Q515.8594,17.375 516.5,17.5313 Q517.1563,17.6875 517.7188,17.9844 L517.7188,20.7031 Q517.0938,20.125 516.5,19.8594 Q515.9063,19.5781 515.2813,19.5781 Q513.9375,19.5781 513.25,20.6563 Q512.5625,21.7188 512.5625,23.8125 Q512.5625,25.9063 513.25,26.9844 Q513.9375,28.0469 515.2813,28.0469 Q515.9063,28.0469 516.5,27.7813 Q517.0938,27.5 517.7188,26.9219 L517.7188,29.6406 Z "/>
+      <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="535.25" y="28.1543">A::custom_thread2</text>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="382" x2="774" y1="40" y2="40"/>
+      <line style="stroke: #A80036; stroke-width: 1.5;" x1="382" x2="774" y1="48" y2="48"/>
+      <ellipse cx="392" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
+      <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="368" x="401" y="62.2104">thread((lambda at ../../tests/t00051/t00051.cc:59:27) &amp;&amp; ) : void</text>
+    </a>
+    <path d="M377,400.19 C377,412.73 377,426.25 377,439.47 " fill="none" id="C_0000129489662928342298-&gt;C_0000704524754474791953" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="none" points="384,439.79,377,459.79,370,439.79,384,439.79" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M377,228.11 C377,245.32 377,264.89 377,282.93 " fill="none" id="C_0001064663612772326174-&gt;C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <polygon fill="#A80036" points="377,287.98,381,278.98,377,282.98,373,278.98,377,287.98" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M219.12,69.1 C240.93,84.08 268.16,102.77 293.83,120.4 " fill="none" id="C_0000267762118222214764-&gt;C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="299.6888" cy="124.4162" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="293.0976" x2="306.28" y1="119.8823" y2="128.95"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="304.2226" x2="295.1549" y1="117.8249" y2="131.0074"/>
+    <path d="M534.88,69.1 C513.07,84.08 485.84,102.77 460.17,120.4 " fill="none" id="C_0000728501319748477470-&gt;C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <ellipse cx="454.3112" cy="124.4162" fill="#FFFFFF" rx="8" ry="8" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="460.9024" x2="447.72" y1="119.8823" y2="128.95"/>
+    <line style="stroke: #A80036; stroke-width: 1.0;" x1="458.8451" x2="449.7774" y1="131.0074" y2="117.8249"/>
+  </g>
+</svg>
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index 84d1f756..5f20df98 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="467px" preserveAspectRatio="none" style="width:324px;height:467px;" version="1.1" viewBox="0 0 324 467" width="324px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qo9uh8hztwo7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbr5cqffz34a2" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,59 +9,59 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="77" x2="77" y1="38.2969" y2="427.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="175.5" x2="175.5" y1="38.2969" y2="427.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="303" x2="303" y1="38.2969" y2="427.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qo9uh8hztwo7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1qo9uh8hztwo7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="446.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qo9uh8hztwo7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1qo9uh8hztwo7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="446.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qo9uh8hztwo7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1qo9uh8hztwo7)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="446.2217">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1qo9uh8hztwo7)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159,65.4297,169,69.4297,159,73.4297,163,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="165" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="89" y="64.3638">add(int,int)</text>
     </a>
     <polygon fill="#A80036" points="93,79.4297,83,83.4297,93,87.4297,89,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="87" x2="175" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="286,108.5625,296,112.5625,286,116.5625,290,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="292" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="89" y="107.4966">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,137.6953,182,141.6953,192,145.6953,188,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="198" y="136.6294">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="228" y1="165.8281" y2="165.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="165.8281" y2="178.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="178.8281" y2="178.8281"/>
@@ -72,7 +72,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="228" x2="228" y1="202.8281" y2="215.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="228" y1="215.8281" y2="215.8281"/>
     <polygon fill="#A80036" points="191,211.8281,181,215.8281,191,219.8281,187,215.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="228" y1="239.9609" y2="239.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="239.9609" y2="252.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="252.9609" y2="252.9609"/>
@@ -81,14 +81,14 @@
     </a>
     <polygon fill="#A80036" points="286,292.9609,296,296.9609,286,300.9609,290,296.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="176" x2="292" y1="296.9609" y2="296.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,322.0938,182,326.0938,192,330.0938,188,326.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="326.0938" y2="326.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="198" y="321.0278">log_result(int)</text>
     </a>
     <polygon fill="#A80036" points="88,366.0938,78,370.0938,88,374.0938,84,370.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="82" x2="302" y1="370.0938" y2="370.0938"/>
-    <path d="M8,383.0938 L8,408.0938 L143,408.0938 L143,393.0938 L133,383.0938 L8,383.0938 " fill="#FBFB77" filter="url(#f1qo9uh8hztwo7)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,383.0938 L8,408.0938 L143,408.0938 L143,393.0938 L133,383.0938 L8,383.0938 " fill="#FBFB77" filter="url(#fbr5cqffz34a2)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M133,383.0938 L133,393.0938 L143,393.0938 L133,383.0938 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="14" y="400.1606">Main test function</text>
   </g>
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 95486344..2738aa27 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1e40b7rwtao8e" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fmckmtgtyqpxd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
-      <rect fill="#FEFECE" filter="url(#f1e40b7rwtao8e)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1e40b7rwtao8e)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index 69c310b1..cd4241ad 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4821yk0e20fp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10tm2ddd0tvf4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f4821yk0e20fp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f4821yk0e20fp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index 9c464770..0d7f6cfa 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16skf2u8ktdg9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1k2850rq65rna" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
@@ -29,87 +29,87 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f16skf2u8ktdg9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f16skf2u8ktdg9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
     </a>
@@ -117,11 +117,11 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
     <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
     </a>
@@ -129,19 +129,19 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
     <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
     </a>
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index 7ac19404..c7b39f4a 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fizmt9hxruonw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13p9otp0v016f" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fizmt9hxruonw)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fizmt9hxruonw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fizmt9hxruonw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fizmt9hxruonw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fizmt9hxruonw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fizmt9hxruonw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fizmt9hxruonw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fizmt9hxruonw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fizmt9hxruonw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fizmt9hxruonw)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fizmt9hxruonw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fizmt9hxruonw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index b5fbbea9..0abb88c5 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:1034px;height:754px;" version="1.1" viewBox="0 0 1034 754" width="1034px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjdyjfh1zb58b" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1sj0a0spic15d" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="714.2891"/>
@@ -34,82 +34,82 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="654" x2="654" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="780" x2="780" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="923" x2="923" y1="38.2969" y2="714.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="733.2842">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="733.2842">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="733.2842">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="733.2842">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="733.2842">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="733.2842">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="623" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="623" y="733.2842">AA&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="710" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="710" y="733.2842">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="874" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fjdyjfh1zb58b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="874" y="733.2842">BB&lt;int,float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fjdyjfh1zb58b)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
@@ -118,12 +118,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
@@ -132,59 +132,59 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="539,237.9609,549,241.9609,539,245.9609,543,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="545" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="236.895">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="637.5,267.0938,647.5,271.0938,637.5,275.0938,641.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="561" x2="643.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="568" y="266.0278">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="539,326.2266,549,330.2266,539,334.2266,543,330.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="545" y1="330.2266" y2="330.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="325.1606">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="637.5,355.3594,647.5,359.3594,637.5,363.3594,641.5,359.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="561" x2="643.5" y1="359.3594" y2="359.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="568" y="354.2935">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,414.4922,773,418.4922,763,422.4922,767,418.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="769" y1="418.4922" y2="418.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="413.4263">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,443.625,660.5,447.625,670.5,451.625,666.5,447.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="774" y1="447.625" y2="447.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="442.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,502.7578,773,506.7578,763,510.7578,767,506.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="769" y1="506.7578" y2="506.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="501.6919">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,531.8906,660.5,535.8906,670.5,539.8906,666.5,535.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="774" y1="535.8906" y2="535.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="530.8247">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="906,591.0234,916,595.0234,906,599.0234,910,595.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="912" y1="595.0234" y2="595.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="589.9575">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="928" x2="975" y1="619.1563" y2="619.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="975" x2="975" y1="619.1563" y2="632.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="934" x2="975" y1="632.1563" y2="632.1563"/>
       <polygon fill="#A80036" points="944,628.1563,934,632.1563,944,636.1563,940,632.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="940" y="614.0903">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,662.2891,660.5,666.2891,670.5,670.2891,666.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="922" y1="666.2891" y2="666.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="661.2231">aa2(int)</text>
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index 2641241b..0bec7169 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f60ehzj02lgo8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1sx5e15ash1rn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f60ehzj02lgo8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f60ehzj02lgo8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index 63f912f9..778e912a 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frlyx35y5g3ha" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ldcg084xamk9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frlyx35y5g3ha)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#frlyx35y5g3ha)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index 7c9cf24c..751d78bb 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvv4552xc6bwf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f18yw4bcxsfjpg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvv4552xc6bwf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fvv4552xc6bwf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 51c8a205..89a3d2d5 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9a553opittgf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1w33yzwl1x6ca" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9a553opittgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f9a553opittgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9a553opittgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9a553opittgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9a553opittgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f9a553opittgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9a553opittgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index a0d140df..a1febec8 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnx06ljdmyfmo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ndr4uk1qyobw" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnx06ljdmyfmo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fnx06ljdmyfmo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnx06ljdmyfmo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fnx06ljdmyfmo)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fnx06ljdmyfmo)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
@@ -52,26 +52,26 @@
     <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
       <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
@@ -81,14 +81,14 @@
     <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
       <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
@@ -98,7 +98,7 @@
     <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index 429825fb..4c90e47f 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1203px" preserveAspectRatio="none" style="width:1784px;height:1203px;" version="1.1" viewBox="0 0 1784 1203" width="1784px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1tmlwqe9sr7st" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kv0tt0em0cuc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="272" x2="272" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="484" x2="484" y1="38.2969" y2="1163.4844"/>
@@ -43,122 +43,122 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1178.5" x2="1178.5" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1554.5" x2="1554.5" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1762.5" x2="1762.5" y1="38.2969" y2="1163.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L58" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L58" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L58" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L58" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1182.4795">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L66" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L66" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L66" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L66" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="1182.4795">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="1182.4795">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L79" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L79" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L79" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L79" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="1182.4795">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L47" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L47" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L47" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L47" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="22.9951">R&lt;R::(lambda ../../tests/t20012/t20012.cc:85:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="1182.4795">R&lt;R::(lambda ../../tests/t20012/t20012.cc:85:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L85" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1755.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f1tmlwqe9sr7st)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1755.5" y="1182.4795">D</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1tmlwqe9sr7st)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="255.5,65.4297,265.5,69.4297,255.5,73.4297,259.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="261.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,94.5625,477.5,98.5625,467.5,102.5625,471.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="505.5,131.6953,495.5,135.6953,505.5,139.6953,501.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="169.8281" y2="169.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="169.8281" y2="182.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="182.8281" y2="182.8281"/>
       <polygon fill="#A80036" points="510.5,178.8281,500.5,182.8281,510.5,186.8281,506.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,237.9609,540.5,241.9609,530.5,245.9609,534.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="266.0938" y2="266.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="266.0938" y2="279.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="279.0938" y2="279.0938"/>
       <polygon fill="#A80036" points="568.5,275.0938,558.5,279.0938,568.5,283.0938,564.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="313.2266" y2="313.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="313.2266" y2="326.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="326.2266" y2="326.2266"/>
@@ -167,67 +167,67 @@
     </a>
     <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="271.5" y1="370.2266" y2="370.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L83" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L83" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L83" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L83" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="743,395.3594,753,399.3594,743,403.3594,747,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="749" y1="399.3594" y2="399.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L80" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L80" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="955.5,424.4922,965.5,428.4922,955.5,432.4922,959.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="765" x2="961.5" y1="428.4922" y2="428.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="772" y="423.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="452.625" y2="452.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="452.625" y2="465.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="465.625" y2="465.625"/>
       <polygon fill="#A80036" points="993.5,461.625,983.5,465.625,993.5,469.625,989.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="447.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="499.7578" y2="499.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="499.7578" y2="512.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="512.7578" y2="512.7578"/>
       <polygon fill="#A80036" points="998.5,508.7578,988.5,512.7578,998.5,516.7578,994.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="994.5" y="494.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288.5,567.8906,278.5,571.8906,288.5,575.8906,284.5,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282.5" x2="754" y1="571.8906" y2="571.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="294.5" y="566.8247">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,597.0234,477.5,601.0234,467.5,605.0234,471.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="601.0234" y2="601.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="595.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="625.1563" y2="625.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="625.1563" y2="638.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="638.1563" y2="638.1563"/>
       <polygon fill="#A80036" points="505.5,634.1563,495.5,638.1563,505.5,642.1563,501.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="620.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="672.2891" y2="672.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="672.2891" y2="685.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="685.2891" y2="685.2891"/>
       <polygon fill="#A80036" points="510.5,681.2891,500.5,685.2891,510.5,689.2891,506.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="667.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,740.4219,540.5,744.4219,530.5,748.4219,534.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="744.4219" y2="744.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="739.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="768.5547" y2="768.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="768.5547" y2="781.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="781.5547" y2="781.5547"/>
       <polygon fill="#A80036" points="568.5,777.5547,558.5,781.5547,568.5,785.5547,564.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="763.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="815.6875" y2="815.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="815.6875" y2="828.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="828.6875" y2="828.6875"/>
@@ -238,29 +238,29 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="272.5" x2="749" y1="872.6875" y2="872.6875"/>
     <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="759" y1="886.6875" y2="886.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L87" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L87" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L87" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L87" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1161.5,911.8203,1171.5,915.8203,1161.5,919.8203,1165.5,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1167.5" y1="915.8203" y2="915.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="910.7544">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1537.5,940.9531,1547.5,944.9531,1537.5,948.9531,1541.5,944.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1183.5" x2="1543.5" y1="944.9531" y2="944.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="1190.5" y="939.8872">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="988.5,970.0859,978.5,974.0859,988.5,978.0859,984.5,974.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="982.5" x2="1548.5" y1="974.0859" y2="974.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="994.5" y="969.02">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="998.2188" y2="998.2188"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="998.2188" y2="1011.2188"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="1011.2188" y2="1011.2188"/>
       <polygon fill="#A80036" points="993.5,1007.2188,983.5,1011.2188,993.5,1015.2188,989.5,1011.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="993.1528">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="1045.3516" y2="1045.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="1045.3516" y2="1058.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="1058.3516" y2="1058.3516"/>
@@ -269,7 +269,7 @@
     </a>
     <polygon fill="#A80036" points="1189.5,1098.3516,1179.5,1102.3516,1189.5,1106.3516,1185.5,1102.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1183.5" x2="1553.5" y1="1102.3516" y2="1102.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L93" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20012/t20012.cc#L93" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L93" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L93" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1746,1127.4844,1756,1131.4844,1746,1135.4844,1750,1131.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1752" y1="1131.4844" y2="1131.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="58" x="53" y="1126.4185">add5(int)</text>
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index 9c22897d..5ee90a2d 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f26xgdab5l2fa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fs6s3bub0enm3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f26xgdab5l2fa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f26xgdab5l2fa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f26xgdab5l2fa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f26xgdab5l2fa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f26xgdab5l2fa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f26xgdab5l2fa)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f26xgdab5l2fa)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -58,12 +58,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
@@ -72,12 +72,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index 36f59381..f27cc46b 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bx8oixmjutss" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fynrt5ko3v75r" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1bx8oixmjutss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1bx8oixmjutss)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
@@ -67,12 +67,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
@@ -81,17 +81,17 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index 3b1772c9..b6544984 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1478yj866yltp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1miu8nm50onvy" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1478yj866yltp)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1478yj866yltp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1478yj866yltp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1478yj866yltp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1478yj866yltp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1478yj866yltp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1478yj866yltp)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1478yj866yltp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index 24e963c4..d79a46c1 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1j4jtlvy2aqs9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10u00t3d0b7uc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j4jtlvy2aqs9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1j4jtlvy2aqs9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j4jtlvy2aqs9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1j4jtlvy2aqs9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j4jtlvy2aqs9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1j4jtlvy2aqs9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1j4jtlvy2aqs9)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index bd81c135..02f796e2 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cy8r5vp0rw2r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f67cnykww8p7i" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,65 +9,65 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
-    <rect fill="#FEFECE" filter="url(#f1cy8r5vp0rw2r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f1cy8r5vp0rw2r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f1cy8r5vp0rw2r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f1cy8r5vp0rw2r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f1cy8r5vp0rw2r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
-    <rect fill="#FEFECE" filter="url(#f1cy8r5vp0rw2r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1cy8r5vp0rw2r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index e59d423f..3d56f2e0 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvvqepr7ryv5v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7vvjernpx3bm" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,14 +9,14 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
@@ -25,93 +25,93 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fvvqepr7ryv5v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fvvqepr7ryv5v)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index b4c781f5..bd9ca548 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fysbvr0r5rdut" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1csbfxy12qnbg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
-      <rect fill="#FEFECE" filter="url(#fysbvr0r5rdut)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fysbvr0r5rdut)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index e91f5fd8..bbde7194 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="832px" preserveAspectRatio="none" style="width:346px;height:832px;" version="1.1" viewBox="0 0 346 832" width="346px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9us173umqoyp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1f672jzabx66m" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,78 +9,78 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="293.9297" style="stroke: none; stroke-width: 1.0;" width="252.5" x="13" y="115.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
     <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="232.5" x="23" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="231.5" x2="231.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="290.5" x2="290.5" y1="38.2969" y2="792.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="811.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="811.5498">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="811.5498">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="224.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="224.5" y="811.5498">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L34" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L34" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L34" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L34" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="262.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9us173umqoyp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="262.5" y="811.5498">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
-    <rect fill="#FFFFFF" filter="url(#f9us173umqoyp)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
@@ -91,7 +91,7 @@
     <path d="M23,124.5625 L87,124.5625 L87,131.5625 L77,141.5625 L23,141.5625 L23,124.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="137.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,158.8281,126,162.8281,116,166.8281,120,162.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="162.8281" y2="162.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="157.7622">[</text>
@@ -100,7 +100,7 @@
     </a>
     <polygon fill="#A80036" points="82,172.8281,72,176.8281,82,180.8281,78,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="176.8281" y2="176.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,201.9609,163.5,205.9609,153.5,209.9609,157.5,205.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="205.9609" y2="205.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="200.895">[</text>
@@ -109,7 +109,7 @@
     </a>
     <polygon fill="#A80036" points="82,215.9609,72,219.9609,82,223.9609,78,219.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="219.9609" y2="219.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,245.0938,224.5,249.0938,214.5,253.0938,218.5,249.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="249.0938" y2="249.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="244.0278">b1()</text>
@@ -117,7 +117,7 @@
     <polygon fill="#A80036" points="82,259.0938,72,263.0938,82,267.0938,78,263.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="230.5" y1="263.0938" y2="263.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="255.5" y1="272.0938" y2="272.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,290.2266,126,294.2266,116,298.2266,120,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="294.2266" y2="294.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="289.1606">[</text>
@@ -126,21 +126,21 @@
     </a>
     <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="308.2266" y2="308.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,333.3594,224.5,337.3594,214.5,341.3594,218.5,337.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="337.3594" y2="337.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="332.2935">b2()</text>
     </a>
     <polygon fill="#A80036" points="82,347.3594,72,351.3594,82,355.3594,78,351.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="230.5" y1="351.3594" y2="351.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,383.4922,126,387.4922,116,391.4922,120,387.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="387.4922" y2="387.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="382.4263">a4()</text>
     </a>
     <polygon fill="#A80036" points="82,397.4922,72,401.4922,82,405.4922,78,401.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="401.4922" y2="401.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,433.625,224.5,437.625,214.5,441.625,218.5,437.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="437.625" y2="437.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="432.5591">log()</text>
@@ -148,7 +148,7 @@
     <path d="M23,482.625 L87,482.625 L87,489.625 L77,499.625 L23,499.625 L23,482.625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="495.6919">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,516.8906,163.5,520.8906,153.5,524.8906,157.5,520.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="520.8906" y2="520.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="78" y="515.8247">c1()</text>
@@ -156,7 +156,7 @@
     <path d="M146.5,535.8906 L210.5,535.8906 L210.5,542.8906 L200.5,552.8906 L146.5,552.8906 L146.5,535.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="548.9575">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="569.1563" y2="569.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="569.1563" y2="582.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="582.1563" y2="582.1563"/>
@@ -169,7 +169,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="606.1563" y2="619.1563"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="619.1563" y2="619.1563"/>
     <polygon fill="#A80036" points="185.5,615.1563,175.5,619.1563,185.5,623.1563,181.5,619.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="643.2891" y2="643.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="643.2891" y2="656.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="656.2891" y2="656.2891"/>
@@ -179,7 +179,7 @@
     <path d="M23,715.2891 L87,715.2891 L87,722.2891 L77,732.2891 L23,732.2891 L23,715.2891 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="728.356">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20020/t20020.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="273.5,749.5547,283.5,753.5547,273.5,757.5547,277.5,753.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="279.5" y1="753.5547" y2="753.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="748.4888">d1(int,int)</text>
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index 1e086395..a1af68ff 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1fmuox9mz4rd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbbhlzvv9v32i" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1fmuox9mz4rd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1fmuox9mz4rd)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
     <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
@@ -89,7 +89,7 @@
     <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
@@ -102,7 +102,7 @@
     <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
@@ -120,7 +120,7 @@
     </a>
     <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
@@ -129,14 +129,14 @@
     </a>
     <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
     </a>
     <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
@@ -148,7 +148,7 @@
     <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="552.9575">b2()</text>
@@ -158,7 +158,7 @@
     <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
@@ -167,7 +167,7 @@
     </a>
     <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="677.356">b2()</text>
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 5387f115..957b4cc0 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="186px" preserveAspectRatio="none" style="width:165px;height:186px;" version="1.1" viewBox="0 0 165 186" width="165px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnxwoh5oaegge" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ppq4uw0jcnjz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,39 +9,39 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fnxwoh5oaegge)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnxwoh5oaegge)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnxwoh5oaegge)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="146.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="146.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="144.5" x2="144.5" y1="38.2969" y2="146.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxwoh5oaegge)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fnxwoh5oaegge)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="165.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxwoh5oaegge)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fnxwoh5oaegge)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="165.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnxwoh5oaegge)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fnxwoh5oaegge)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="165.5576">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fnxwoh5oaegge)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fnxwoh5oaegge)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fnxwoh5oaegge)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="127.5,94.5625,137.5,98.5625,127.5,102.5625,131.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="133.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="109.5" y="93.4966">b()</text>
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index 99bad8fd..40d52f1b 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f3gecsqfjsayt" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fols92mqjmu8k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,37 +9,37 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3gecsqfjsayt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f3gecsqfjsayt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3gecsqfjsayt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f3gecsqfjsayt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#f3gecsqfjsayt)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
@@ -47,7 +47,7 @@
     <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
@@ -73,7 +73,7 @@
     <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
@@ -86,7 +86,7 @@
     <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index 0d9f2212..c7d346fc 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hzqfo74osshp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1me15gkhv6mwu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
@@ -33,36 +33,36 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hzqfo74osshp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1hzqfo74osshp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hzqfo74osshp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1hzqfo74osshp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hzqfo74osshp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1hzqfo74osshp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f1hzqfo74osshp)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
@@ -85,7 +85,7 @@
     <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
@@ -98,7 +98,7 @@
     <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
@@ -111,7 +111,7 @@
     <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
@@ -124,7 +124,7 @@
     <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
@@ -134,7 +134,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
@@ -143,7 +143,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
@@ -152,7 +152,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
@@ -161,7 +161,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index acf4b295..2b3a9220 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:220px;height:241px;" version="1.1" viewBox="0 0 220 241" width="220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffcpn70gnou06" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fviaeucah56je" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,41 +9,41 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="201.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffcpn70gnou06)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#ffcpn70gnou06)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="220.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffcpn70gnou06)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#ffcpn70gnou06)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="220.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ffcpn70gnou06)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#ffcpn70gnou06)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="220.5576">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#ffcpn70gnou06)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="107.5" x2="149.5" y1="98.5625" y2="98.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="98.5625" y2="111.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="111.5625" y2="111.5625"/>
@@ -52,7 +52,7 @@
     </a>
     <polygon fill="#A80036" points="57,151.5625,47,155.5625,57,159.5625,53,155.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="155.5625" y2="155.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="150,165.5625,160,169.5625,150,173.5625,154,169.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="169.5625" y2="169.5625"/>
     </a>
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index 1b23bc38..d7ef3896 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1czv777jkeum4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12kwc9lo2flyv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1czv777jkeum4)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1czv777jkeum4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1czv777jkeum4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1czv777jkeum4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1czv777jkeum4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1czv777jkeum4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1czv777jkeum4)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1czv777jkeum4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index d5ac2918..1771888c 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bisguu7yat03" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lxrbsg3ga1nc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1bisguu7yat03)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bisguu7yat03)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bisguu7yat03)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1bisguu7yat03)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bisguu7yat03)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1bisguu7yat03)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1bisguu7yat03)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1bisguu7yat03)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index 0cf5cd0a..1dc328ef 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:148px;height:304px;" version="1.1" viewBox="0 0 148 304" width="148px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frkldcpdqqj1n" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hhybxvs6bnkv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,50 +9,50 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="123" x="13" y="201.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="112" x2="112" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frkldcpdqqj1n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#frkldcpdqqj1n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frkldcpdqqj1n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="106" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#frkldcpdqqj1n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="106" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#frkldcpdqqj1n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,89.5625,105.5,93.5625,95.5,97.5625,99.5,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="88.4966">a()</text>
     </a>
     <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,132.6953,105.5,136.6953,95.5,140.6953,99.5,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="136.6953" y2="136.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
     </a>
     <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,175.8281,105.5,179.8281,95.5,183.8281,99.5,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="179.8281" y2="179.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="193.8281" y2="193.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="136" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,220.9609,105.5,224.9609,95.5,228.9609,99.5,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="224.9609" y2="224.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index 681bf2b5..e2110411 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="508px" preserveAspectRatio="none" style="width:1017px;height:508px;" version="1.1" viewBox="0 0 1017 508" width="1017px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fow9mu1f4g2q1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1rqz4zm16z70c" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,60 +9,60 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="249" x2="249" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="498" x2="498" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="698" x2="698" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="879" x2="879" y1="38.2969" y2="468.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="487.4873">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="487.4873">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="487.4873">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="487.4873">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#fow9mu1f4g2q1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="487.4873">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fow9mu1f4g2q1)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,65.4297,691,69.4297,681,73.4297,685,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="687" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="78" y="64.3638">connect()</text>
@@ -73,21 +73,21 @@
     <path d="M23,138.5625 L87,138.5625 L87,145.5625 L77,155.5625 L23,155.5625 L23,138.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="151.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="232,172.8281,242,176.8281,232,180.8281,236,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="238" y1="176.8281" y2="176.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="171.7622">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="84" y="171.7622">send(std::string &amp;&amp;)</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="215" y="171.7622">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="301" y1="200.9609" y2="200.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="301" y1="200.9609" y2="213.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="260" x2="301" y1="213.9609" y2="213.9609"/>
       <polygon fill="#A80036" points="270,209.9609,260,213.9609,270,217.9609,266,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="266" y="195.895">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="862,228.9609,872,232.9609,862,236.9609,866,232.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="259" x2="868" y1="232.9609" y2="232.9609"/>
     </a>
@@ -97,7 +97,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="301" y1="265.9609" y2="278.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="254" x2="301" y1="278.9609" y2="278.9609"/>
     <polygon fill="#A80036" points="264,274.9609,254,278.9609,264,282.9609,260,278.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="481,299.0938,491,303.0938,481,307.0938,485,303.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="487" y1="303.0938" y2="303.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="261" y="298.0278">send(std::string &amp;&amp;)</text>
@@ -108,7 +108,7 @@
     <path d="M389,342.2266 L453,342.2266 L453,349.2266 L443,359.2266 L389,359.2266 L389,342.2266 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="404" y="355.2935">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,376.4922,691,380.4922,681,384.4922,685,380.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="503" x2="687" y1="380.4922" y2="380.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="510" y="375.4263">[</text>
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 2cd622ca..4f9e5bd8 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="264px" preserveAspectRatio="none" style="width:854px;height:264px;" version="1.1" viewBox="0 0 854 264" width="854px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fyksjy8yijpd4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1boi03qz5lgl6" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,67 +9,67 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="63.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="63.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="157.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fyksjy8yijpd4)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="157.9951">BB</text>
     </a>
-    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#fyksjy8yijpd4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#f1boi03qz5lgl6)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M482,157 L482,167 L492,167 L482,157 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="174.0669">A AAA note...</text>
-    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#fyksjy8yijpd4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#f1boi03qz5lgl6)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M264,8 L264,18 L274,18 L264,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="25.0669">This is namespace AA in namespace A</text>
-    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#fyksjy8yijpd4)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#f1boi03qz5lgl6)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M726,8 L726,18 L736,18 L726,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="25.0669">This is namespace AA in namespace B</text>
-    <path d="M313.72,169.5 C337.7,169.5 361.68,169.5 385.66,169.5 " fill="none" id="C_0000274638237740249424-GMN853" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M140,33.03 C140,41.56 140,54.0963 140,68.1503 C140,75.1773 140,82.5838 140,90.0587 C140,91.9274 140,93.8004 140,95.6728 C140,96.609 140,97.5451 140,98.4804 C140,98.9481 140,99.4155 140,99.8827 " fill="none" id="GMN856-C_0001528517990989164155" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M602,33.03 C602,41.56 602,54.0963 602,68.1503 C602,75.1773 602,82.5838 602,90.0587 C602,91.9274 602,93.8004 602,95.6728 C602,96.609 602,97.5451 602,98.4804 C602,98.9481 602,99.4155 602,99.8827 " fill="none" id="GMN859-C_0000895913707182089871" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M313.72,169.5 C337.7,169.5 361.68,169.5 385.66,169.5 " fill="none" id="C_0000274638237740249424-GMN868" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M140,33.03 C140,41.56 140,54.0963 140,68.1503 C140,75.1773 140,82.5838 140,90.0587 C140,91.9274 140,93.8004 140,95.6728 C140,96.609 140,97.5451 140,98.4804 C140,98.9481 140,99.4155 140,99.8827 " fill="none" id="GMN871-C_0001528517990989164155" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M602,33.03 C602,41.56 602,54.0963 602,68.1503 C602,75.1773 602,82.5838 602,90.0587 C602,91.9274 602,93.8004 602,95.6728 C602,96.609 602,97.5451 602,98.4804 C602,98.9481 602,99.4155 602,99.8827 " fill="none" id="GMN874-C_0000895913707182089871" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index 0b654526..cee5be09 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1462px;height:402px;" version="1.1" viewBox="0 0 1462 402" width="1462px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1341qgifbsh0h" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgg41f2mm1zh1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,113 +9,113 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="22,219,39,219,46,241.2969,1440,241.2969,1440,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="22,219,39,219,46,241.2969,1440,241.2969,1440,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="46,262,74,262,81,284.2969,1416,284.2969,1416,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="46,262,74,262,81,284.2969,1416,284.2969,1416,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L79" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="706,24,722,24,729,46.2969,836,46.2969,836,195,706,195,706,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="706,24,722,24,729,46.2969,836,46.2969,836,195,706,195,706,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="706" x2="729" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="710" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L79" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="730,67,756,67,763,89.2969,812,89.2969,812,171,730,171,730,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="730,67,756,67,763,89.2969,812,89.2969,812,171,730,171,730,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="730" x2="763" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="734" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="1358.5,297,1385.5,297,1392.5,319.2969,1399.5,319.2969,1399.5,349.5938,1358.5,349.5938,1358.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1358.5,297,1385.5,297,1392.5,319.2969,1399.5,319.2969,1399.5,349.5938,1358.5,349.5938,1358.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1358.5" x2="1392.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1362.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L14" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L14" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="1282.5,297,1309.5,297,1316.5,319.2969,1323.5,319.2969,1323.5,349.5938,1282.5,349.5938,1282.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L14" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L14" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1282.5,297,1309.5,297,1316.5,319.2969,1323.5,319.2969,1323.5,349.5938,1282.5,349.5938,1282.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1282.5" x2="1316.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1286.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="1206.5,297,1233.5,297,1240.5,319.2969,1247.5,319.2969,1247.5,349.5938,1206.5,349.5938,1206.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1206.5,297,1233.5,297,1240.5,319.2969,1247.5,319.2969,1247.5,349.5938,1206.5,349.5938,1206.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1206.5" x2="1240.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1210.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L22" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L22" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="1130.5,297,1157.5,297,1164.5,319.2969,1171.5,319.2969,1171.5,349.5938,1130.5,349.5938,1130.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L22" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L22" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1130.5,297,1157.5,297,1164.5,319.2969,1171.5,319.2969,1171.5,349.5938,1130.5,349.5938,1130.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1130.5" x2="1164.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1134.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L26" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L26" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="1054.5,297,1081.5,297,1088.5,319.2969,1095.5,319.2969,1095.5,349.5938,1054.5,349.5938,1054.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L26" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L26" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1054.5,297,1081.5,297,1088.5,319.2969,1095.5,319.2969,1095.5,349.5938,1054.5,349.5938,1054.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1054.5" x2="1088.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1058.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L30" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="978.5,297,1005.5,297,1012.5,319.2969,1019.5,319.2969,1019.5,349.5938,978.5,349.5938,978.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L30" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="978.5,297,1005.5,297,1012.5,319.2969,1019.5,319.2969,1019.5,349.5938,978.5,349.5938,978.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="978.5" x2="1012.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="982.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L34" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L34" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="902.5,297,929.5,297,936.5,319.2969,943.5,319.2969,943.5,349.5938,902.5,349.5938,902.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L34" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L34" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="902.5,297,929.5,297,936.5,319.2969,943.5,319.2969,943.5,349.5938,902.5,349.5938,902.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="902.5" x2="936.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="906.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L38" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L38" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="826.5,297,853.5,297,860.5,319.2969,867.5,319.2969,867.5,349.5938,826.5,349.5938,826.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L38" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L38" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="826.5,297,853.5,297,860.5,319.2969,867.5,319.2969,867.5,349.5938,826.5,349.5938,826.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="826.5" x2="860.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="830.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L42" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="750.5,297,777.5,297,784.5,319.2969,791.5,319.2969,791.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L42" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="750.5,297,777.5,297,784.5,319.2969,791.5,319.2969,791.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="784.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="754.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L46" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L46" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L46" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L46" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="668.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L50" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L50" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L50" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L50" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="582.5" y="311.9951">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L54" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L54" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="496.5" y="311.9951">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L58" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L58" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L58" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L58" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="450.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="410.5" y="311.9951">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L62" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L62" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L66" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L66" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L66" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L66" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L70" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L70" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L70" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L70" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L74" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L74" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L74" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L74" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L79" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1341qgifbsh0h)" points="746,102,782,102,789,124.2969,796,124.2969,796,154.5938,746,154.5938,746,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="746,102,782,102,789,124.2969,796,124.2969,796,154.5938,746,154.5938,746,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="746" x2="789" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="750" y="116.9951">BBB</text>
     </a>
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index 4c6d0868..cf51a6ac 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:343px;height:392px;" version="1.1" viewBox="0 0 343 392" width="343px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2frazdzza59r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1j86l0bag2yk1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,35 +9,35 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2frazdzza59r)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="298.2969" y2="298.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="290.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L21" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L21" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2frazdzza59r)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L21" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L21" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="217" y1="54.5769" y2="54.5769"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="179" y="47.2751">ns3</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="69.572">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L23" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2frazdzza59r)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="130.2969" y2="130.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="122.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2frazdzza59r)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="325.9951">ns2_v1_0_0</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L10" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L10" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2frazdzza59r)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L10" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L10" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="325.9951">ns2_v0_9_0</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="53" y="348.292">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L23" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2frazdzza59r)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="157.9951">ns2</text>
     </a>
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 4369a7e6..04e57506 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f2xnmgxbyl9j6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1qel845y3q059" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,46 +9,46 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#f2xnmgxbyl9j6)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#f1qel845y3q059)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
     </a>
-    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f2xnmgxbyl9j6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M325,186 L325,196 L335,196 L325,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="231" y="203.0669">Package AAA.</text>
-    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f2xnmgxbyl9j6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M566,73 L566,83 L576,83 L566,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="472" y="90.0669">Package BBB.</text>
-    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f2xnmgxbyl9j6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
-    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f2xnmgxbyl9j6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M335.5,73 L335.5,83 L345.5,83 L335.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="220.5" y="90.0669">We skipped DDD.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2xnmgxbyl9j6)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qel845y3q059)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="130.5" y="73.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2xnmgxbyl9j6)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qel845y3q059)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f2xnmgxbyl9j6)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qel845y3q059)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#f2xnmgxbyl9j6)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#f1qel845y3q059)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="374.5" y="186.9951">EEE</text>
     </a>
-    <path d="M179.62,109.77 C206.24,133.04 246.1,167.87 266.66,185.84 " fill="none" id="C_0001517185300862579159-GMN938" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M431.16,85.5 C442.74,85.5 454.32,85.5 465.9,85.5 " fill="none" id="C_0001982379087062354928-GMN942" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M76.36,112.24 C86.6,135.43 101.18,168.45 108.84,185.8 " fill="none" id="C_0002304726195556701567-GMN946" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M292.2,98.38 C310.81,116.5 346.63,151.38 370.43,174.55 " fill="none" id="GMN950-C_0001084924732216290779" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M179.62,109.77 C206.24,133.04 246.1,167.87 266.66,185.84 " fill="none" id="C_0001517185300862579159-GMN953" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M431.16,85.5 C442.74,85.5 454.32,85.5 465.9,85.5 " fill="none" id="C_0001982379087062354928-GMN957" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M76.36,112.24 C86.6,135.43 101.18,168.45 108.84,185.8 " fill="none" id="C_0002304726195556701567-GMN961" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M292.2,98.38 C310.81,116.5 346.63,151.38 370.43,174.55 " fill="none" id="GMN965-C_0001084924732216290779" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index 448b790e..d8093ab3 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:332px;height:402px;" version="1.1" viewBox="0 0 332 402" width="332px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fytjs9z2meq7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1qp1pa3cdunoe" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,48 +9,48 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="98" x2="122" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="102" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L17" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L9" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L17" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fytjs9z2meq7)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
     </a>
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 701c54e4..6aee8ee9 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fn2jy6fuvy8c8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1sizjfq13zh71" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fn2jy6fuvy8c8)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1sizjfq13zh71)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30006/t30006.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30006/t30006.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fn2jy6fuvy8c8)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1sizjfq13zh71)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="115.2969" y2="115.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="107.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30006/t30006.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30006/t30006.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fn2jy6fuvy8c8)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1sizjfq13zh71)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
     </a>
-    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#fn2jy6fuvy8c8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#f1sizjfq13zh71)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M91,8 L91,18 L101,18 L91,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="13" y="25.0669">Top A note.</text>
-    <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN973-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN988-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <path d="M46.35,146.24 C41.51,162.5 35.25,183.58 30.15,200.71 " fill="none" id="C_0001499919423527579699-&gt;C_0001659090172211944144" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="28.61,205.89,35.0172,198.4102,30.0402,201.0989,27.3514,196.1219,28.61,205.89" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M61.65,146.24 C66.49,162.5 72.75,183.58 77.85,200.71 " fill="none" id="C_0001499919423527579699-&gt;C_0001380567463986115369" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index eedf878a..638284d5 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f96g4f40ot3ju" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1rya9y1fl1da2" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,30 +9,30 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f96g4f40ot3ju)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.5" y1="79.2969" y2="79.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="104.5" y="71.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f96g4f40ot3ju)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.5" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="186.5" y="227.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L11" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L11" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f96g4f40ot3ju)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L11" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L11" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.5" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="147.5" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30007/t30007.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f96g4f40ot3ju)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
     </a>
-    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#f96g4f40ot3ju)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#f1rya9y1fl1da2)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M201,8 L201,18 L211,18 L201,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="12" y="25.0669">Compare layout with t30006.</text>
-    <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN985-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1000-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <path d="M172.15,153.24 C176.99,169.5 183.25,190.58 188.35,207.71 " fill="none" id="C_0000357722505818238170-&gt;C_0001852704221005355550" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="189.89,212.89,191.1486,203.1219,188.4598,208.0989,183.4828,205.4102,189.89,212.89" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M145.89,153.24 C138.89,169.5 132.42,190.58 129.1,207.71 " fill="none" id="C_0000357722505818238170-&gt;C_0000937791537887318363" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index 2c9a4446..2110d401 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7n8jyvn3ia20" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1pk34sixkccfa" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L24" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L24" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L24" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L24" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L32" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L32" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L32" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L32" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L37" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t30008/t30008.cc#L37" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f7n8jyvn3ia20)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L37" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L37" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
     </a>
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index de931f54..30988840 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="377px" preserveAspectRatio="none" style="width:676px;height:377px;" version="1.1" viewBox="0 0 676 377" width="676px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1vt6b9e38h8xo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fknffhuqo0kcf" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1vt6b9e38h8xo)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fknffhuqo0kcf)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1vt6b9e38h8xo)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fknffhuqo0kcf)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="157.2969" y2="157.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="149.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1vt6b9e38h8xo)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fknffhuqo0kcf)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="252.2969" y2="252.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="244.9951">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1vt6b9e38h8xo)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M283,59 L283,69 L293,69 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="81.9951">t40001.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1vt6b9e38h8xo)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M185.5,170 L185.5,180 L195.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="192.9951">t40001_include1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1vt6b9e38h8xo)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M144.5,273 L144.5,283 L154.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="295.9951">lib1.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#f1vt6b9e38h8xo)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M442.5,273 L442.5,283 L452.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="295.9951">string</text>
-    <polygon fill="#FEFECE" filter="url(#f1vt6b9e38h8xo)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M354.5,170 L354.5,180 L364.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="192.9951">vector</text>
-    <polygon fill="#FEFECE" filter="url(#f1vt6b9e38h8xo)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M348.5,273 L348.5,283 L358.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="295.9951">yaml-cpp/yaml.h</text>
-    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#f1vt6b9e38h8xo)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#fknffhuqo0kcf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M644.5,278.5 L644.5,288.5 L654.5,288.5 L644.5,278.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="295.5669">This is a lib1 include dir</text>
-    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#f1vt6b9e38h8xo)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#fknffhuqo0kcf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M654,175.5 L654,185.5 L664,185.5 L654,175.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="192.5669">This is a t40001_include1.h include file</text>
     <path d="M247.19,95.33 C246.91,123.45 250.93,178.61 284,206 C299.81,219.09 358.52,203.24 376,214 C395.8,226.19 408.53,250.17 415.68,267.94 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="267.25,272.98,261.882,264.7226,263.0571,270.2561,257.5237,271.4312,267.25,272.98" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M195.6,202.55 C204.48,203.86 213.43,205.06 222,206 C239.03,207.87 361.25,205.27 376,214 C396.14,225.92 408.86,250.17 415.91,268.09 " fill="none" id="C_0001926692816440595520-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
     <polygon fill="#A80036" points="417.76,272.96,418.309,263.1265,415.9872,268.2848,410.8288,265.963,417.76,272.96" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <path d="M70.1058,229.8551 C70.2152,229.6198 70.326,229.3851 70.4381,229.1512 C71.3346,227.28 72.316,225.4553 73.3896,223.6932 C75.537,220.1689 78.0538,216.895 81,214 C86.69,208.41 90.57,210.89 98.5,210 C137.59,205.59 413.41,205.59 452.5,210 C499.3,215.28 541.59,256.91 560.52,278.34 " fill="none" id="C_0001687675335949018432-GMN1030" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
-    <path d="M155.77,169.95 C191.28,152.87 248.55,128.97 301.5,123 C329.32,119.86 336.68,119.86 364.5,123 C419.83,129.24 479.43,158.38 510.45,175.45 " fill="none" id="C_0001926692816440595520-GMN1033" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M70.1058,229.8551 C70.2152,229.6198 70.326,229.3851 70.4381,229.1512 C71.3346,227.28 72.316,225.4553 73.3896,223.6932 C75.537,220.1689 78.0538,216.895 81,214 C86.69,208.41 90.57,210.89 98.5,210 C137.59,205.59 413.41,205.59 452.5,210 C499.3,215.28 541.59,256.91 560.52,278.34 " fill="none" id="C_0001687675335949018432-GMN1045" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
+    <path d="M155.77,169.95 C191.28,152.87 248.55,128.97 301.5,123 C329.32,119.86 336.68,119.86 364.5,123 C419.83,129.24 479.43,158.38 510.45,175.45 " fill="none" id="C_0001926692816440595520-GMN1048" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
   </g>
 </svg>
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index ef9dd273..f0e6921c 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fy2tmd5ug1fyz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1815zdic4kpfa" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,46 +9,46 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fy2tmd5ug1fyz)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fy2tmd5ug1fyz)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#fy2tmd5ug1fyz)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
-    <polygon fill="#FFFFFF" filter="url(#fy2tmd5ug1fyz)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fy2tmd5ug1fyz)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#fy2tmd5ug1fyz)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fy2tmd5ug1fyz)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fy2tmd5ug1fyz)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fy2tmd5ug1fyz)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fy2tmd5ug1fyz)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fy2tmd5ug1fyz)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
     </a>
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index 5c22d8d3..0fa9fc42 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fqudtmsu5jpap" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc8v69utobj4u" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,66 +9,66 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fqudtmsu5jpap)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fqudtmsu5jpap)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#fqudtmsu5jpap)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
-    <polygon fill="#FFFFFF" filter="url(#fqudtmsu5jpap)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fqudtmsu5jpap)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#fqudtmsu5jpap)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/a9f793e4078a0902bc890d1515728af002c3546f/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fqudtmsu5jpap)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
     </a>

From b802eaee3d578dd1012d4c76d03ee75beec715ee Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 22 Jan 2023 15:49:12 +0100
Subject: [PATCH 09/11] Fixed relative lambda names in MSVC

---
 .../visitor/translation_unit_visitor.cc       | 15 ++++++++++----
 src/config/config.h                           | 12 ++++++++++-
 src/config/yaml_emitters.cc                   | 18 +++++++++++++++++
 src/decorators/decorators.cc                  |  2 +-
 src/main.cc                                   |  5 +++--
 tests/test_util.cc                            | 20 +++++++++++++------
 6 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 129cbd44..0fb23d60 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1143,20 +1143,27 @@ void translation_unit_visitor::process_function_parameter(
 void translation_unit_visitor::ensure_lambda_type_is_relative(
     std::string &parameter_type) const
 {
-    std::string lambda_prefix{"(lambda at /"};
+#ifdef _MSC_VER
+    auto root_name = fmt::format(
+        "{}\\", std::filesystem::current_path().root_name().string());
+#else
+    auto root_name = "/";
+#endif
+    std::string lambda_prefix{fmt::format("(lambda at {}", root_name)};
 
     while (parameter_type.find(lambda_prefix) != std::string::npos) {
         auto lambda_begin = parameter_type.find(lambda_prefix);
 
-        auto absolute_lambda_path_end = parameter_type.find(':', lambda_begin);
+        auto absolute_lambda_path_end =
+            parameter_type.find(':', lambda_begin + lambda_prefix.size());
         auto absolute_lambda_path =
             parameter_type.substr(lambda_begin + lambda_prefix.size() - 1,
                 absolute_lambda_path_end -
                     (lambda_begin + lambda_prefix.size() - 1));
 
-        auto relative_lambda_path = std::filesystem::relative(
+        auto relative_lambda_path = util::path_to_url(std::filesystem::relative(
             absolute_lambda_path, config().relative_to())
-                                        .string();
+                                                          .string());
 
         parameter_type = fmt::format("{}(lambda at {}{}",
             parameter_type.substr(0, lambda_begin), relative_lambda_path,
diff --git a/src/config/config.h b/src/config/config.h
index 893f511c..79868b2e 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -255,6 +255,13 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const package_diagram &c);
 
 YAML::Emitter &operator<<(YAML::Emitter &out, const layout_hint &c);
 
+#ifdef _MSC_VER
+YAML::Emitter &operator<<(YAML::Emitter &out, const std::filesystem::path &p);
+
+YAML::Emitter &operator<<(
+    YAML::Emitter &out, const std::vector<std::filesystem::path> &p);
+#endif
+
 YAML::Emitter &operator<<(YAML::Emitter &out, const source_location &sc);
 
 template <typename T>
@@ -262,7 +269,10 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const option<T> &o)
 {
     if (o.has_value) {
         out << YAML::Key << o.name;
-        out << YAML::Value << o.value;
+        if constexpr (std::is_same_v<T, std::filesystem::path>)
+            out << YAML::Value << o.value.string();
+        else
+            out << YAML::Value << o.value;
     }
     return out;
 }
diff --git a/src/config/yaml_emitters.cc b/src/config/yaml_emitters.cc
index 8737a6ee..e1147bc7 100644
--- a/src/config/yaml_emitters.cc
+++ b/src/config/yaml_emitters.cc
@@ -138,6 +138,24 @@ YAML::Emitter &operator<<(YAML::Emitter &out, const comment_parser_t &cp)
     return out;
 }
 
+#ifdef _MSC_VER
+YAML::Emitter &operator<<(YAML::Emitter &out, const std::filesystem::path &p)
+{
+    out << p.string();
+    return out;
+}
+
+YAML::Emitter &operator<<(
+    YAML::Emitter &out, const std::vector<std::filesystem::path> &paths)
+{
+    out << YAML::BeginSeq;
+    for (const auto &p : paths)
+        out << p;
+    out << YAML::EndSeq;
+    return out;
+}
+#endif
+
 YAML::Emitter &operator<<(YAML::Emitter &out, const layout_hint &c)
 {
     out << YAML::BeginMap;
diff --git a/src/decorators/decorators.cc b/src/decorators/decorators.cc
index 8e062353..d113b67e 100644
--- a/src/decorators/decorators.cc
+++ b/src/decorators/decorators.cc
@@ -62,7 +62,7 @@ decorator_toks decorator::tokenize(const std::string &label, std::string_view c)
     decorator_toks res;
     res.label = label;
     size_t pos{};
-    const auto *it = c.begin();
+    std::string_view::const_iterator it = c.begin();
     std::advance(it, label.size());
 
     if (*it == ':') {
diff --git a/src/main.cc b/src/main.cc
index 4fc101ce..a8e130be 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -264,11 +264,12 @@ int main(int argc, const char *argv[])
     //
     if (compilation_database_dir) {
         config.compilation_database_dir.set(
-            util::ensure_path_is_absolute(compilation_database_dir.value()));
+            util::ensure_path_is_absolute(compilation_database_dir.value())
+                .string());
     }
     if (output_directory) {
         config.output_directory.set(
-            util::ensure_path_is_absolute(output_directory.value()));
+            util::ensure_path_is_absolute(output_directory.value()).string());
     }
 
     LOG_INFO("Loading compilation database from {} directory",
diff --git a/tests/test_util.cc b/tests/test_util.cc
index be4bb2cd..b4860c9f 100644
--- a/tests/test_util.cc
+++ b/tests/test_util.cc
@@ -232,12 +232,20 @@ TEST_CASE("Test ensure_path_is_absolute", "[unit-test]")
 {
     using namespace clanguml::util;
 
-    CHECK(ensure_path_is_absolute("a/b/c", "/tmp").string() == "/tmp/a/b/c");
-    CHECK(ensure_path_is_absolute("/a/b/c", "/tmp").string() == "/a/b/c");
-    CHECK(ensure_path_is_absolute("", "/tmp").string() == "/tmp/");
-    CHECK(ensure_path_is_absolute(".", "/tmp").string() == "/tmp/");
-    CHECK(ensure_path_is_absolute("..", "/tmp").string() == "/");
-    CHECK(ensure_path_is_absolute("/", "/tmp").string() == "/");
+    using std::filesystem::path;
+
+    CHECK(ensure_path_is_absolute("a/b/c", "/tmp").string() ==
+        path{"/tmp/a/b/c"}.make_preferred());
+    CHECK(ensure_path_is_absolute("/a/b/c", "/tmp").string() ==
+        path{"/a/b/c"}.make_preferred());
+    CHECK(ensure_path_is_absolute("", "/tmp").string() ==
+        path{"/tmp/"}.make_preferred());
+    CHECK(ensure_path_is_absolute(".", "/tmp").string() ==
+        path{"/tmp/"}.make_preferred());
+    CHECK(ensure_path_is_absolute("..", "/tmp").string() ==
+        path{"/"}.make_preferred());
+    CHECK(ensure_path_is_absolute("/", "/tmp").string() ==
+        path{"/"}.make_preferred());
 }
 
 TEST_CASE("Test hash_seed", "[unit-test]")

From 2136ebefb3024486be934c91128367c5836f5008 Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 22 Jan 2023 16:02:53 +0100
Subject: [PATCH 10/11] Fixed clang-tidy warnings

---
 src/class_diagram/visitor/translation_unit_visitor.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/class_diagram/visitor/translation_unit_visitor.cc b/src/class_diagram/visitor/translation_unit_visitor.cc
index 0fb23d60..c3ecdfcd 100644
--- a/src/class_diagram/visitor/translation_unit_visitor.cc
+++ b/src/class_diagram/visitor/translation_unit_visitor.cc
@@ -1147,7 +1147,7 @@ void translation_unit_visitor::ensure_lambda_type_is_relative(
     auto root_name = fmt::format(
         "{}\\", std::filesystem::current_path().root_name().string());
 #else
-    auto root_name = "/";
+    auto root_name = std::string{"/"};
 #endif
     std::string lambda_prefix{fmt::format("(lambda at {}", root_name)};
 

From da30adc6c8ceff5207522942a375e8c7466bc37f Mon Sep 17 00:00:00 2001
From: Bartek Kryza <bkryza@gmail.com>
Date: Sun, 22 Jan 2023 16:04:57 +0100
Subject: [PATCH 11/11] Updated test cases documentation

---
 docs/test_cases/t00002_class.svg    |  36 ++---
 docs/test_cases/t00003_class.svg    |  46 +++----
 docs/test_cases/t00004_class.svg    |  76 +++++------
 docs/test_cases/t00005_class.svg    | 110 +++++++--------
 docs/test_cases/t00006_class.svg    | 132 +++++++++---------
 docs/test_cases/t00007_class.svg    |  30 ++--
 docs/test_cases/t00008_class.svg    |  56 ++++----
 docs/test_cases/t00009_class.svg    |  32 ++---
 docs/test_cases/t00010_class.svg    |  34 ++---
 docs/test_cases/t00011_class.svg    |  22 +--
 docs/test_cases/t00012_class.svg    |  66 ++++-----
 docs/test_cases/t00013_class.svg    |  82 +++++------
 docs/test_cases/t00014_class.svg    | 116 ++++++++--------
 docs/test_cases/t00015_class.svg    |  22 +--
 docs/test_cases/t00016_class.svg    |  30 ++--
 docs/test_cases/t00017_class.svg    |  66 ++++-----
 docs/test_cases/t00018_class.svg    |  18 +--
 docs/test_cases/t00019_class.svg    |  40 +++---
 docs/test_cases/t00020_class.svg    |  38 +++---
 docs/test_cases/t00021_class.svg    |  30 ++--
 docs/test_cases/t00022_class.svg    |  14 +-
 docs/test_cases/t00023_class.svg    |  26 ++--
 docs/test_cases/t00024_class.svg    |  22 +--
 docs/test_cases/t00025_class.svg    |  34 ++---
 docs/test_cases/t00026_class.svg    |  42 +++---
 docs/test_cases/t00027_class.svg    |  58 ++++----
 docs/test_cases/t00028_class.svg    |  78 +++++------
 docs/test_cases/t00029_class.svg    |  50 +++----
 docs/test_cases/t00030_class.svg    |  46 +++----
 docs/test_cases/t00031_class.svg    |  50 +++----
 docs/test_cases/t00032_class.svg    |  40 +++---
 docs/test_cases/t00033_class.svg    |  48 +++----
 docs/test_cases/t00034_class.svg    |  46 +++----
 docs/test_cases/t00035_class.svg    |  22 +--
 docs/test_cases/t00036_class.svg    |  38 +++---
 docs/test_cases/t00037_class.svg    |  54 ++++----
 docs/test_cases/t00038_class.svg    |  58 ++++----
 docs/test_cases/t00039_class.svg    |  78 +++++------
 docs/test_cases/t00040_class.svg    |  26 ++--
 docs/test_cases/t00041_class.svg    |  54 ++++----
 docs/test_cases/t00042_class.svg    |  36 ++---
 docs/test_cases/t00043_class.svg    |  50 +++----
 docs/test_cases/t00044_class.svg    |  36 ++---
 docs/test_cases/t00045_class.svg    |  70 +++++-----
 docs/test_cases/t00046_class.svg    |  64 ++++-----
 docs/test_cases/t00047_class.svg    |  22 +--
 docs/test_cases/t00048_class.svg    |  50 +++----
 docs/test_cases/t00049_class.svg    |  32 ++---
 docs/test_cases/t00050_class.svg    |  70 +++++-----
 docs/test_cases/t00051_class.svg    |  38 +++---
 docs/test_cases/t20001_sequence.svg |  62 ++++-----
 docs/test_cases/t20002_sequence.svg |  48 +++----
 docs/test_cases/t20003_sequence.svg |  48 +++----
 docs/test_cases/t20004_sequence.svg | 120 ++++++++--------
 docs/test_cases/t20005_sequence.svg |  36 ++---
 docs/test_cases/t20006_sequence.svg | 150 ++++++++++----------
 docs/test_cases/t20007_sequence.svg |  48 +++----
 docs/test_cases/t20008_sequence.svg |  84 ++++++------
 docs/test_cases/t20009_sequence.svg |  84 ++++++------
 docs/test_cases/t20010_sequence.svg |  72 +++++-----
 docs/test_cases/t20011_sequence.svg |  72 +++++-----
 docs/test_cases/t20012_sequence.svg | 204 ++++++++++++++--------------
 docs/test_cases/t20013_sequence.svg |  60 ++++----
 docs/test_cases/t20014_sequence.svg |  72 +++++-----
 docs/test_cases/t20015_sequence.svg |  24 ++--
 docs/test_cases/t20016_sequence.svg |  48 +++----
 docs/test_cases/t20017_sequence.svg |  48 +++----
 docs/test_cases/t20018_sequence.svg |  96 ++++++-------
 docs/test_cases/t20019_sequence.svg |  84 ++++++------
 docs/test_cases/t20020_sequence.svg | 118 ++++++++--------
 docs/test_cases/t20021_sequence.svg | 106 +++++++--------
 docs/test_cases/t20022_sequence.svg |  36 ++---
 docs/test_cases/t20023_sequence.svg |  50 +++----
 docs/test_cases/t20024_sequence.svg |  88 ++++++------
 docs/test_cases/t20025_sequence.svg |  42 +++---
 docs/test_cases/t20026_sequence.svg |  24 ++--
 docs/test_cases/t20027_sequence.svg |  24 ++--
 docs/test_cases/t20028_sequence.svg |  44 +++---
 docs/test_cases/t20029_sequence.svg |  80 +++++------
 docs/test_cases/t30001_package.svg  |  48 +++----
 docs/test_cases/t30002_package.svg  |  90 ++++++------
 docs/test_cases/t30003_package.svg  |  26 ++--
 docs/test_cases/t30004_package.svg  |  30 ++--
 docs/test_cases/t30005_package.svg  |  38 +++---
 docs/test_cases/t30006_package.svg  |  16 +--
 docs/test_cases/t30007_package.svg  |  20 +--
 docs/test_cases/t30008_package.svg  |  34 ++---
 docs/test_cases/t40001_include.svg  |  30 ++--
 docs/test_cases/t40002_include.svg  |  34 ++---
 docs/test_cases/t40003_include.svg  |  50 +++----
 90 files changed, 2461 insertions(+), 2461 deletions(-)

diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index 780b6acc..e36403c7 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="362px" preserveAspectRatio="none" style="width:562px;height:362px;" version="1.1" viewBox="0 0 562 362" width="562px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9d4am7myy0o7" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15rqj3eav8veu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15rqj3eav8veu)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
       <ellipse cx="348.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M348.3594,19.3438 L347.2031,24.4219 L349.5313,24.4219 L348.3594,19.3438 Z M346.875,17.1094 L349.8594,17.1094 L353.2188,29.5 L350.7656,29.5 L350,26.4375 L346.7188,26.4375 L345.9688,29.5 L343.5313,29.5 L346.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="28.1543">A</text>
@@ -21,8 +21,8 @@
       <ellipse cx="305" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="75.0151">foo_c() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15rqj3eav8veu)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
       <ellipse cx="111.5" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,164.6406 Q113.8906,164.9375 113.25,165.0781 Q112.6094,165.2344 111.9063,165.2344 Q109.4063,165.2344 108.0781,163.5938 Q106.7656,161.9375 106.7656,158.8125 Q106.7656,155.6875 108.0781,154.0313 Q109.4063,152.375 111.9063,152.375 Q112.6094,152.375 113.25,152.5313 Q113.9063,152.6875 114.4688,152.9844 L114.4688,155.7031 Q113.8438,155.125 113.25,154.8594 Q112.6563,154.5781 112.0313,154.5781 Q110.6875,154.5781 110,155.6563 Q109.3125,156.7188 109.3125,158.8125 Q109.3125,160.9063 110,161.9844 Q110.6875,163.0469 112.0313,163.0469 Q112.6563,163.0469 113.25,162.7813 Q113.8438,162.5 114.4688,161.9219 L114.4688,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="163.1543">B</text>
@@ -31,8 +31,8 @@
       <ellipse cx="80.5" cy="194" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="197.2104">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15rqj3eav8veu)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
       <ellipse cx="348.55" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.5188,164.6406 Q350.9406,164.9375 350.3,165.0781 Q349.6594,165.2344 348.9563,165.2344 Q346.4563,165.2344 345.1281,163.5938 Q343.8156,161.9375 343.8156,158.8125 Q343.8156,155.6875 345.1281,154.0313 Q346.4563,152.375 348.9563,152.375 Q349.6594,152.375 350.3,152.5313 Q350.9563,152.6875 351.5188,152.9844 L351.5188,155.7031 Q350.8938,155.125 350.3,154.8594 Q349.7063,154.5781 349.0813,154.5781 Q347.7375,154.5781 347.05,155.6563 Q346.3625,156.7188 346.3625,158.8125 Q346.3625,160.9063 347.05,161.9844 Q347.7375,163.0469 349.0813,163.0469 Q349.7063,163.0469 350.3,162.7813 Q350.8938,162.5 351.5188,161.9219 L351.5188,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="163.1543">C</text>
@@ -41,18 +41,18 @@
       <ellipse cx="318" cy="194" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="197.2104">foo_c() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15rqj3eav8veu)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
       <ellipse cx="98.75" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.7188,286.6406 Q101.1406,286.9375 100.5,287.0781 Q99.8594,287.2344 99.1563,287.2344 Q96.6563,287.2344 95.3281,285.5938 Q94.0156,283.9375 94.0156,280.8125 Q94.0156,277.6875 95.3281,276.0313 Q96.6563,274.375 99.1563,274.375 Q99.8594,274.375 100.5,274.5313 Q101.1563,274.6875 101.7188,274.9844 L101.7188,277.7031 Q101.0938,277.125 100.5,276.8594 Q99.9063,276.5781 99.2813,276.5781 Q97.9375,276.5781 97.25,277.6563 Q96.5625,278.7188 96.5625,280.8125 Q96.5625,282.9063 97.25,283.9844 Q97.9375,285.0469 99.2813,285.0469 Q99.9063,285.0469 100.5,284.7813 Q101.0938,284.5 101.7188,283.9219 L101.7188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="285.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="303"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="311.2104">as : std::vector&lt;A *&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.8047" y2="317.8047"/>
@@ -60,18 +60,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.0151">foo_a() : void</text>
     <ellipse cx="44.5" cy="341.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.8198">foo_c() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9d4am7myy0o7)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15rqj3eav8veu)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
       <ellipse cx="469.25" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.2188,286.6406 Q471.6406,286.9375 471,287.0781 Q470.3594,287.2344 469.6563,287.2344 Q467.1563,287.2344 465.8281,285.5938 Q464.5156,283.9375 464.5156,280.8125 Q464.5156,277.6875 465.8281,276.0313 Q467.1563,274.375 469.6563,274.375 Q470.3594,274.375 471,274.5313 Q471.6563,274.6875 472.2188,274.9844 L472.2188,277.7031 Q471.5938,277.125 471,276.8594 Q470.4063,276.5781 469.7813,276.5781 Q468.4375,276.5781 467.75,277.6563 Q467.0625,278.7188 467.0625,280.8125 Q467.0625,282.9063 467.75,283.9844 Q468.4375,285.0469 469.7813,285.0469 Q470.4063,285.0469 471,284.7813 Q471.5938,284.5 472.2188,283.9219 L472.2188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="285.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="303"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="311.2104">as : std::vector&lt;A *&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.8047" y2="317.8047"/>
@@ -79,13 +79,13 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.0151">foo_a() : void</text>
     <ellipse cx="414.5" cy="341.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.8198">foo_c() : void</text>
-    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f9d4am7myy0o7)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f15rqj3eav8veu)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M249,32.5 L249,42.5 L259,42.5 L249,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="49.5669">This is class A</text>
-    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f9d4am7myy0o7)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f15rqj3eav8veu)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105,32.5 L105,42.5 L115,42.5 L105,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="49.5669">This is class B</text>
-    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f9d4am7myy0o7)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f15rqj3eav8veu)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M358,265 L358,275 L368,275 L358,265 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="282.0669"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="297.1997">This is class D</text>
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index 5b58d568..eec47254 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="398px" preserveAspectRatio="none" style="width:347px;height:398px;" version="1.1" viewBox="0 0 347 398" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1fzpr96g8of6w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcc7g8ayn5fq7" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fzpr96g8of6w)" height="380.9219" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcc7g8ayn5fq7)" height="380.9219" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
@@ -112,11 +112,11 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="355.7183">protected_method() : void</text>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="362.3125"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="368.5229">private_method() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
       <polygon fill="#FFFF44" points="18,373.1172,22,377.1172,18,381.1172,14,377.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="381.3276">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index 549d2675..5534f62c 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1toeho9mwpp8j" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f61617c27a3qh" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
       <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
@@ -28,8 +28,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
       <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
@@ -40,16 +40,16 @@
       <ellipse cx="187.5" cy="353.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="357.0151">foo2() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
       <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
       <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
@@ -59,15 +59,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
       <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+    <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
     <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
@@ -75,8 +75,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="480" y="36.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
       <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
@@ -84,39 +84,39 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="590.5" y="299.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="328"/>
       <ellipse cx="501.5" cy="333" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L26" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L26" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="336.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="340.8047"/>
       <ellipse cx="501.5" cy="345.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L39" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="349.0151">b_int : B&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L28" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L28" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
       <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L29" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L29" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L29" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L29" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
       <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L32" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L32" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L32" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L32" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
       <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
@@ -125,8 +125,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L35" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L35" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L35" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L35" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
       <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
@@ -134,16 +134,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="428" y="170.6387">V</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="199.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="201.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L36" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L36" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="207.7104">b : V</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="214.3047" y2="214.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L41" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L41" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L41" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L41" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
       <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
@@ -152,16 +152,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L45" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L45" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
       <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L47" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L47" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
       <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
@@ -171,8 +171,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L49" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00004/t00004.cc#L49" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1toeho9mwpp8j)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L49" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00004/t00004.cc#L49" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f61617c27a3qh)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
       <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index ac6a4f18..691ca799 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="384px" preserveAspectRatio="none" style="width:799px;height:384px;" version="1.1" viewBox="0 0 799 384" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jcgt6wng5cgl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="faso7k6zsuhfs" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,204 +9,204 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
       <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
       <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
       <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L12" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L12" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L12" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L12" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
       <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
       <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L18" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L18" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L18" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L18" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
       <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L21" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L21" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
       <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L24" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L24" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L24" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L24" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
       <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L27" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L27" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
       <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L30" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L30" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
       <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L33" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L33" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
       <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jcgt6wng5cgl)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#faso7k6zsuhfs)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="46"/>
       <ellipse cx="308" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="54.2104">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="58.8047"/>
       <ellipse cx="308" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="67.0151">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="71.6094"/>
       <ellipse cx="308" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="79.8198">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="84.4141"/>
       <ellipse cx="308" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="92.6245">some_int_reference : int &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="97.2188"/>
       <ellipse cx="308" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L42" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L42" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="105.4292">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="110.0234"/>
       <ellipse cx="308" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L43" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L43" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="118.2339">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="122.8281"/>
       <ellipse cx="308" cy="127.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L44" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L44" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="131.0386">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="135.6328"/>
       <ellipse cx="308" cy="140.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L45" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L45" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="143.8433">d : const D *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="148.4375"/>
       <ellipse cx="308" cy="153.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L46" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L46" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="156.6479">e : const E &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="161.2422"/>
       <ellipse cx="308" cy="166.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L47" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L47" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="169.4526">f : F &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="174.0469"/>
       <ellipse cx="308" cy="179.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L48" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L48" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="182.2573">g : G **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="186.8516"/>
       <ellipse cx="308" cy="191.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L49" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L49" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="195.062">h : H ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="199.6563"/>
       <ellipse cx="308" cy="204.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L50" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L50" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="207.8667">i : I *&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="212.4609"/>
       <ellipse cx="308" cy="217.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L51" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L51" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="220.6714">j : volatile J *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="225.2656"/>
       <ellipse cx="308" cy="230.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L52" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00005/t00005.cc#L52" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="233.4761">k : K *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="240.0703" y2="240.0703"/>
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 3bcff342..4ee4a473 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:1390px;height:479px;" version="1.1" viewBox="0 0 1390 479" width="1390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnsfmyv0i18xl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fn7nhpqwdue9b" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,136 +9,136 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
       <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
       <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
       <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
       <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
       <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L22" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L22" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L22" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L22" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
       <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
       <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L28" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L28" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L28" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L28" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
       <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L31" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L31" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
       <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L34" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L34" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L34" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L34" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
       <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L37" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L37" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
       <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L40" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L40" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L40" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L40" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
       <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L43" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L43" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L43" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L43" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
       <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L46" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L46" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
       <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L49" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L49" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
       <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L52" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L52" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
       <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L55" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L55" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
       <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
@@ -146,15 +146,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1371.5" y="417.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="446"/>
       <ellipse cx="1232.5" cy="451" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L57" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="data" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="454.2104">data : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="460.8047" y2="460.8047"/>
-    <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+    <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
     <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
@@ -162,102 +162,102 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="1305" y="308.1387">E</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="331" y2="331"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="339" y2="339"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L60" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnsfmyv0i18xl)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L60" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fn7nhpqwdue9b)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
       <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="46"/>
       <ellipse cx="482" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L62" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L62" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="54.2104">a : std::vector&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="58.8047"/>
       <ellipse cx="482" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L63" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="67.0151">b : std::vector&lt;B *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="71.6094"/>
       <ellipse cx="482" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L65" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="79.8198">c : std::map&lt;int,C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="84.4141"/>
       <ellipse cx="482" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L66" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L66" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="92.6245">d : std::map&lt;int,D *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="97.2188"/>
       <ellipse cx="482" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L68" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L68" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="105.4292">e : custom_container&lt;E&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="110.0234"/>
       <ellipse cx="482" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L70" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L70" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="118.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="122.8281"/>
       <ellipse cx="482" cy="127.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L71" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L71" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="131.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="135.6328"/>
       <ellipse cx="482" cy="140.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L73" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L73" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="143.8433">h : std::array&lt;H,10&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="148.4375"/>
       <ellipse cx="482" cy="153.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L74" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L74" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="156.6479">i : std::array&lt;I *,5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="161.2422"/>
       <ellipse cx="482" cy="166.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L76" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L76" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="169.4526">j : J[10]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="174.0469"/>
       <ellipse cx="482" cy="179.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L77" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L77" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="182.2573">k : K *[20]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="186.8516"/>
       <ellipse cx="482" cy="191.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L79" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L79" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="195.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="199.6563"/>
       <ellipse cx="482" cy="204.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L81" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00006/t00006.cc#L81" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="207.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="214.4609" y2="214.4609"/>
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index 8d64e3c3..86102710 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:207px;height:230px;" version="1.1" viewBox="0 0 207 230" width="207px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f639at1hvkmez" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fvxr2epqvvyda" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvxr2epqvvyda)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvxr2epqvvyda)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
       <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvxr2epqvvyda)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
       <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L14" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f639at1hvkmez)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L14" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvxr2epqvvyda)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
       <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="46"/>
       <ellipse cx="32.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L16" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L16" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="54.2104">a : std::unique_ptr&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="58.8047"/>
       <ellipse cx="32.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L17" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L17" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="67.0151">b : std::shared_ptr&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="71.6094"/>
       <ellipse cx="32.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L18" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00007/t00007.cc#L18" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="79.8198">c : std::weak_ptr&lt;C&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index f10a444d..ffb49f40 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:616px;height:390px;" version="1.1" viewBox="0 0 616 390" width="616px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhg4cbxygp0on" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4sbw7r62beaq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="124.8281" id="C_0001329861609426650509" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4sbw7r62beaq)" height="124.8281" id="C_0001329861609426650509" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="6" y="8"/>
       <ellipse cx="37.65" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M40.6188,29.6406 Q40.0406,29.9375 39.4,30.0781 Q38.7594,30.2344 38.0563,30.2344 Q35.5563,30.2344 34.2281,28.5938 Q32.9156,26.9375 32.9156,23.8125 Q32.9156,20.6875 34.2281,19.0313 Q35.5563,17.375 38.0563,17.375 Q38.7594,17.375 39.4,17.5313 Q40.0563,17.6875 40.6188,17.9844 L40.6188,20.7031 Q39.9938,20.125 39.4,19.8594 Q38.8063,19.5781 38.1813,19.5781 Q36.8375,19.5781 36.15,20.6563 Q35.4625,21.7188 35.4625,23.8125 Q35.4625,25.9063 36.15,26.9844 Q36.8375,28.0469 38.1813,28.0469 Q38.8063,28.0469 39.4,27.7813 Q39.9938,27.5 40.6188,26.9219 L40.6188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="55.35" y="28.1543">A</text>
@@ -18,51 +18,51 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="89" y="17.1387">T,P,CMP,int N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="67.0151">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="71.6094"/>
       <ellipse cx="17" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="79.8198">reference : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="84.4141"/>
       <ellipse cx="17" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="92.6245">values : std::vector&lt;P&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="97.2188"/>
       <ellipse cx="17" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="105.4292">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="110.0234"/>
       <ellipse cx="17" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="118.2339">comparator : CMP</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="166" y1="124.8281" y2="124.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="202" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4sbw7r62beaq)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="202" y="40"/>
       <ellipse cx="252.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M255.2188,61.6406 Q254.6406,61.9375 254,62.0781 Q253.3594,62.2344 252.6563,62.2344 Q250.1563,62.2344 248.8281,60.5938 Q247.5156,58.9375 247.5156,55.8125 Q247.5156,52.6875 248.8281,51.0313 Q250.1563,49.375 252.6563,49.375 Q253.3594,49.375 254,49.5313 Q254.6563,49.6875 255.2188,49.9844 L255.2188,52.7031 Q254.5938,52.125 254,51.8594 Q253.4063,51.5781 252.7813,51.5781 Q251.4375,51.5781 250.75,52.6563 Q250.0625,53.7188 250.0625,55.8125 Q250.0625,57.9063 250.75,58.9844 Q251.4375,60.0469 252.7813,60.0469 Q253.4063,60.0469 254,59.7813 Q254.5938,59.5 255.2188,58.9219 L255.2188,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="272.75" y="60.1543">Vector</text>
@@ -70,16 +70,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="358" y="49.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="72" y2="72"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="208" y="78"/>
       <ellipse cx="213" cy="83" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="222" y="86.2104">values : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="203" x2="362" y1="92.8047" y2="92.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="413" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4sbw7r62beaq)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="413" y="319"/>
       <ellipse cx="471.75" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.7188,340.6406 Q474.1406,340.9375 473.5,341.0781 Q472.8594,341.2344 472.1563,341.2344 Q469.6563,341.2344 468.3281,339.5938 Q467.0156,337.9375 467.0156,334.8125 Q467.0156,331.6875 468.3281,330.0313 Q469.6563,328.375 472.1563,328.375 Q472.8594,328.375 473.5,328.5313 Q474.1563,328.6875 474.7188,328.9844 L474.7188,331.7031 Q474.0938,331.125 473.5,330.8594 Q472.9063,330.5781 472.2813,330.5781 Q470.9375,330.5781 470.25,331.6563 Q469.5625,332.7188 469.5625,334.8125 Q469.5625,336.9063 470.25,337.9844 Q470.9375,339.0469 472.2813,339.0469 Q472.9063,339.0469 473.5,338.7813 Q474.0938,338.5 474.7188,337.9219 L474.7188,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="492.25" y="339.1543">B</text>
@@ -87,15 +87,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="553" y="328.1387">T,C&lt;&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="589" y1="351" y2="351"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="419" y="357"/>
       <ellipse cx="424" cy="362" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="433" y="365.2104">template_template : C&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="589" y1="371.8047" y2="371.8047"/>
-    <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="449" y="210"/>
+    <rect fill="#FEFECE" filter="url(#f4sbw7r62beaq)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="449" y="210"/>
     <ellipse cx="464" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466.9688,231.6406 Q466.3906,231.9375 465.75,232.0781 Q465.1094,232.2344 464.4063,232.2344 Q461.9063,232.2344 460.5781,230.5938 Q459.2656,228.9375 459.2656,225.8125 Q459.2656,222.6875 460.5781,221.0313 Q461.9063,219.375 464.4063,219.375 Q465.1094,219.375 465.75,219.5313 Q466.4063,219.6875 466.9688,219.9844 L466.9688,222.7031 Q466.3438,222.125 465.75,221.8594 Q465.1563,221.5781 464.5313,221.5781 Q463.1875,221.5781 462.5,222.6563 Q461.8125,223.7188 461.8125,225.8125 Q461.8125,227.9063 462.5,228.9844 Q463.1875,230.0469 464.5313,230.0469 Q465.1563,230.0469 465.75,229.7813 Q466.3438,229.5 466.9688,228.9219 L466.9688,231.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="478" y="230.1543">B</text>
@@ -103,18 +103,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="495" y="219.1387">int,Vector</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="450" x2="553" y1="242" y2="242"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="450" x2="553" y1="250" y2="250"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhg4cbxygp0on)" height="86.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="398" y="27.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4sbw7r62beaq)" height="86.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="398" y="27.5"/>
       <ellipse cx="492.75" cy="43.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M495.7188,49.1406 Q495.1406,49.4375 494.5,49.5781 Q493.8594,49.7344 493.1563,49.7344 Q490.6563,49.7344 489.3281,48.0938 Q488.0156,46.4375 488.0156,43.3125 Q488.0156,40.1875 489.3281,38.5313 Q490.6563,36.875 493.1563,36.875 Q493.8594,36.875 494.5,37.0313 Q495.1563,37.1875 495.7188,37.4844 L495.7188,40.2031 Q495.0938,39.625 494.5,39.3594 Q493.9063,39.0781 493.2813,39.0781 Q491.9375,39.0781 491.25,40.1563 Q490.5625,41.2188 490.5625,43.3125 Q490.5625,45.4063 491.25,46.4844 Q491.9375,47.5469 493.2813,47.5469 Q493.9063,47.5469 494.5,47.2813 Q495.0938,47 495.7188,46.4219 L495.7188,49.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="513.25" y="47.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="604" y1="59.5" y2="59.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="404" y="65.5"/>
       <ellipse cx="409" cy="70.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="418" y="73.7104">ints : B&lt;int,Vector&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="399" x2="604" y1="80.3047" y2="80.3047"/>
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index 232951d8..c20988fe 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:448px;height:351px;" version="1.1" viewBox="0 0 448 351" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1wz6k7d94w5ae" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fua9vj6faftly" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua9vj6faftly)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
       <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
@@ -18,15 +18,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="186.5" y="289.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="318"/>
       <ellipse cx="127.5" cy="323" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="326.2104">value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="332.8047" y2="332.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
+    <rect fill="#FEFECE" filter="url(#fua9vj6faftly)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
     <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
@@ -34,7 +34,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="52" y="180.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="211" y2="211"/>
-    <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
+    <rect fill="#FEFECE" filter="url(#fua9vj6faftly)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
     <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
@@ -42,7 +42,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="147" y="180.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="211" y2="211"/>
-    <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
+    <rect fill="#FEFECE" filter="url(#fua9vj6faftly)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
     <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
@@ -50,32 +50,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="288" y="180.1387">std::vector&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="211" y2="211"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wz6k7d94w5ae)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fua9vj6faftly)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
       <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="46"/>
       <ellipse cx="36.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="54.2104">aint : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="58.8047"/>
       <ellipse cx="36.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="67.0151">astring : A&lt;std::string&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="71.6094"/>
       <ellipse cx="36.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="79.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index 36818cbc..045fbf49 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="586px" preserveAspectRatio="none" style="width:193px;height:586px;" version="1.1" viewBox="0 0 193 586" width="193px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f81wdnqndqxs5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kuhn8w419hqy" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kuhn8w419hqy)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
       <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
@@ -18,22 +18,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="119.5" y="511.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="540"/>
       <ellipse cx="60.5" cy="545" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="548.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="552.8047"/>
       <ellipse cx="60.5" cy="557.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="561.0151">second : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="567.6094" y2="567.6094"/>
-    <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+    <rect fill="#FEFECE" filter="url(#f1kuhn8w419hqy)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
     <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
@@ -41,8 +41,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="80" y="402.1387">T,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="425" y2="425"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="433" y2="433"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kuhn8w419hqy)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
       <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
@@ -50,15 +50,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="174" y="264.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="301.2104">astring : A&lt;T,std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="307.8047" y2="307.8047"/>
-    <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+    <rect fill="#FEFECE" filter="url(#f1kuhn8w419hqy)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
     <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
@@ -66,18 +66,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.5" y="155.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f81wdnqndqxs5)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kuhn8w419hqy)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
       <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="46"/>
       <ellipse cx="37.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="54.2104">aintstring : B&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index afdf308f..ab268807 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnj1npm2emtdl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbbufrkjf7w1y" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1npm2emtdl)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbufrkjf7w1y)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
       <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="76" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1npm2emtdl)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L15" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L15" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbufrkjf7w1y)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
       <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
@@ -36,18 +36,18 @@
       <ellipse cx="127" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="62.2104">foo() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L27" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L27" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnj1npm2emtdl)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L27" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L27" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbbufrkjf7w1y)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
       <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
       <ellipse cx="127" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L30" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00011/t00011.cc#L30" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="192.2104">m_a : A *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index 705171e8..4860b918 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1362px;height:390px;" version="1.1" viewBox="0 0 1362 390" width="1362px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxlxldl1vcy4w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f39h7bdhrsck7" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
       <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
@@ -18,23 +18,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="972" y="315.1387">T,Ts...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="344"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="352.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="356.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="358.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="365.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
       <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
@@ -43,15 +43,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
       <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
@@ -60,14 +60,14 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
     <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
@@ -75,7 +75,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="804" y="206.1387">int,std::string,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
     <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="113" x="997.5" y="206.1387">int,std::string,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
     <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1190" y="206.1387">3,2,1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
     <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="44" x="1301" y="206.1387">1,1,1,1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
     <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
@@ -107,50 +107,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="450" x="52" y="206.1387">std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxlxldl1vcy4w)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f39h7bdhrsck7)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
       <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="54.2104">a1 : A&lt;int,std::string,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="67.0151">a2 : A&lt;int,std::string,bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="79.8198">b1 : B&lt;3,2,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="92.6245">b2 : B&lt;1,1,1,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="97.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="99.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="105.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="112.0234" y2="112.0234"/>
-    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#fxlxldl1vcy4w)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f39h7bdhrsck7)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
     <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 652b4fd0..36ab2e21 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fopdilcal6ir4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fovrxer86pok0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
       <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
@@ -18,15 +18,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="247" y="449.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="478.5"/>
       <ellipse cx="172" cy="483.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="486.7104">f : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="493.3047" y2="493.3047"/>
-    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
     <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
@@ -34,70 +34,70 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="319.5" y="321.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
       <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="343.5"/>
       <ellipse cx="380" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="351.7104">a : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
       <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="343.5"/>
       <ellipse cx="474" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="351.7104">b : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
       <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="343.5"/>
       <ellipse cx="568.5" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="351.7104">c : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
       <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
       <ellipse cx="17" cy="342" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="345.2104">d : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
     <ellipse cx="17" cy="362.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="366.0151">print(R * r) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
       <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
@@ -105,16 +105,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="842.5" y="449.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="478.5"/>
       <ellipse cx="806.5" cy="483.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="486.7104">e : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="493.3047" y2="493.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
       <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
@@ -122,22 +122,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="1076.5" y="443.1387">T,Args...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="472"/>
       <ellipse cx="961.5" cy="477" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="480.2104">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="484.8047"/>
       <ellipse cx="961.5" cy="489.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="493.0151">args : std::tuple&lt;Args...&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="499.6094" y2="499.6094"/>
-    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
     <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
@@ -145,7 +145,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="837.5" y="321.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
-    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
     <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
@@ -153,7 +153,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="1005" y="321.1387">int,float,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
-    <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
     <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
@@ -161,25 +161,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="696.5" y="321.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fopdilcal6ir4)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fovrxer86pok0)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
       <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
       <ellipse cx="382.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="54.2104">gintstring : G&lt;int,float,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="67.0151">estring : E&lt;std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index d0712cfe..66a671ef 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1078px" preserveAspectRatio="none" style="width:1100px;height:1078px;" version="1.1" viewBox="0 0 1100 1078" width="1100px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcev72m7hajfx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kxn8im3h2a68" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1024" y="561"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1024" y="561"/>
       <ellipse cx="1039" cy="577" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1041.9688,582.6406 Q1041.3906,582.9375 1040.75,583.0781 Q1040.1094,583.2344 1039.4063,583.2344 Q1036.9063,583.2344 1035.5781,581.5938 Q1034.2656,579.9375 1034.2656,576.8125 Q1034.2656,573.6875 1035.5781,572.0313 Q1036.9063,570.375 1039.4063,570.375 Q1040.1094,570.375 1040.75,570.5313 Q1041.4063,570.6875 1041.9688,570.9844 L1041.9688,573.7031 Q1041.3438,573.125 1040.75,572.8594 Q1040.1563,572.5781 1039.5313,572.5781 Q1038.1875,572.5781 1037.5,573.6563 Q1036.8125,574.7188 1036.8125,576.8125 Q1036.8125,578.9063 1037.5,579.9844 Q1038.1875,581.0469 1039.5313,581.0469 Q1040.1563,581.0469 1040.75,580.7813 Q1041.3438,580.5 1041.9688,579.9219 L1041.9688,582.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1053" y="581.1543">A</text>
@@ -18,37 +18,37 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="1070" y="570.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1085" y1="593" y2="593"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1030" y="599"/>
       <ellipse cx="1035" cy="604" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1044" y="607.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1030" y="611.8047"/>
       <ellipse cx="1035" cy="616.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1044" y="620.0151">p : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1085" y1="626.6094" y2="626.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="481.5" y="65.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="481.5" y="65.5"/>
       <ellipse cx="536.75" cy="81.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M539.7188,87.1406 Q539.1406,87.4375 538.5,87.5781 Q537.8594,87.7344 537.1563,87.7344 Q534.6563,87.7344 533.3281,86.0938 Q532.0156,84.4375 532.0156,81.3125 Q532.0156,78.1875 533.3281,76.5313 Q534.6563,74.875 537.1563,74.875 Q537.8594,74.875 538.5,75.0313 Q539.1563,75.1875 539.7188,75.4844 L539.7188,78.2031 Q539.0938,77.625 538.5,77.3594 Q537.9063,77.0781 537.2813,77.0781 Q535.9375,77.0781 535.25,78.1563 Q534.5625,79.2188 534.5625,81.3125 Q534.5625,83.4063 535.25,84.4844 Q535.9375,85.5469 537.2813,85.5469 Q537.9063,85.5469 538.5,85.2813 Q539.0938,85 539.7188,84.4219 L539.7188,87.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557.25" y="85.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="607.5" y1="97.5" y2="97.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="487.5" y="103.5"/>
       <ellipse cx="492.5" cy="108.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="501.5" y="111.7104">value : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="607.5" y1="118.3047" y2="118.3047"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="789" y="832"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="789" y="832"/>
     <ellipse cx="804" cy="848" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M806.9688,853.6406 Q806.3906,853.9375 805.75,854.0781 Q805.1094,854.2344 804.4063,854.2344 Q801.9063,854.2344 800.5781,852.5938 Q799.2656,850.9375 799.2656,847.8125 Q799.2656,844.6875 800.5781,843.0313 Q801.9063,841.375 804.4063,841.375 Q805.1094,841.375 805.75,841.5313 Q806.4063,841.6875 806.9688,841.9844 L806.9688,844.7031 Q806.3438,844.125 805.75,843.8594 Q805.1563,843.5781 804.5313,843.5781 Q803.1875,843.5781 802.5,844.6563 Q801.8125,845.7188 801.8125,847.8125 Q801.8125,849.9063 802.5,850.9844 Q803.1875,852.0469 804.5313,852.0469 Q805.1563,852.0469 805.75,851.7813 Q806.3438,851.5 806.9688,850.9219 L806.9688,853.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="818" y="852.1543">A</text>
@@ -56,7 +56,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="835" y="841.1387">T,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="790" x2="905" y1="864" y2="864"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="790" x2="905" y1="872" y2="872"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="732" y="604"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="732" y="604"/>
     <ellipse cx="747" cy="620" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M749.9688,625.6406 Q749.3906,625.9375 748.75,626.0781 Q748.1094,626.2344 747.4063,626.2344 Q744.9063,626.2344 743.5781,624.5938 Q742.2656,622.9375 742.2656,619.8125 Q742.2656,616.6875 743.5781,615.0313 Q744.9063,613.375 747.4063,613.375 Q748.1094,613.375 748.75,613.5313 Q749.4063,613.6875 749.9688,613.9844 L749.9688,616.7031 Q749.3438,616.125 748.75,615.8594 Q748.1563,615.5781 747.5313,615.5781 Q746.1875,615.5781 745.5,616.6563 Q744.8125,617.7188 744.8125,619.8125 Q744.8125,621.9063 745.5,622.9844 Q746.1875,624.0469 747.5313,624.0469 Q748.1563,624.0469 748.75,623.7813 Q749.3438,623.5 749.9688,622.9219 L749.9688,625.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="761" y="624.1543">A</text>
@@ -64,7 +64,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="778" y="613.1387">T,std::unique_ptr&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="733" x2="962" y1="636" y2="636"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="733" x2="962" y1="644" y2="644"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="806.5" y="303"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="806.5" y="303"/>
     <ellipse cx="821.5" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M824.4688,324.6406 Q823.8906,324.9375 823.25,325.0781 Q822.6094,325.2344 821.9063,325.2344 Q819.4063,325.2344 818.0781,323.5938 Q816.7656,321.9375 816.7656,318.8125 Q816.7656,315.6875 818.0781,314.0313 Q819.4063,312.375 821.9063,312.375 Q822.6094,312.375 823.25,312.5313 Q823.9063,312.6875 824.4688,312.9844 L824.4688,315.7031 Q823.8438,315.125 823.25,314.8594 Q822.6563,314.5781 822.0313,314.5781 Q820.6875,314.5781 820,315.6563 Q819.3125,316.7188 819.3125,318.8125 Q819.3125,320.9063 820,321.9844 Q820.6875,323.0469 822.0313,323.0469 Q822.6563,323.0469 823.25,322.7813 Q823.8438,322.5 824.4688,321.9219 L824.4688,324.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.5" y="323.1543">A</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="852.5" y="312.1387">long,T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="807.5" x2="887.5" y1="335" y2="335"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="807.5" x2="887.5" y1="343" y2="343"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="798.5" y="521"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="798.5" y="521"/>
     <ellipse cx="813.5" cy="537" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M816.4688,542.6406 Q815.8906,542.9375 815.25,543.0781 Q814.6094,543.2344 813.9063,543.2344 Q811.4063,543.2344 810.0781,541.5938 Q808.7656,539.9375 808.7656,536.8125 Q808.7656,533.6875 810.0781,532.0313 Q811.4063,530.375 813.9063,530.375 Q814.6094,530.375 815.25,530.5313 Q815.9063,530.6875 816.4688,530.9844 L816.4688,533.7031 Q815.8438,533.125 815.25,532.8594 Q814.6563,532.5781 814.0313,532.5781 Q812.6875,532.5781 812,533.6563 Q811.3125,534.7188 811.3125,536.8125 Q811.3125,538.9063 812,539.9844 Q812.6875,541.0469 814.0313,541.0469 Q814.6563,541.0469 815.25,540.7813 Q815.8438,540.5 816.4688,539.9219 L816.4688,542.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827.5" y="541.1543">A</text>
@@ -80,7 +80,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="844.5" y="530.1387">double,T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="799.5" x2="895.5" y1="553" y2="553"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="799.5" x2="895.5" y1="561" y2="561"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="503" y="272"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="503" y="272"/>
     <ellipse cx="518" cy="288" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M520.9688,293.6406 Q520.3906,293.9375 519.75,294.0781 Q519.1094,294.2344 518.4063,294.2344 Q515.9063,294.2344 514.5781,292.5938 Q513.2656,290.9375 513.2656,287.8125 Q513.2656,284.6875 514.5781,283.0313 Q515.9063,281.375 518.4063,281.375 Q519.1094,281.375 519.75,281.5313 Q520.4063,281.6875 520.9688,281.9844 L520.9688,284.7031 Q520.3438,284.125 519.75,283.8594 Q519.1563,283.5781 518.5313,283.5781 Q517.1875,283.5781 516.5,284.6563 Q515.8125,285.7188 515.8125,287.8125 Q515.8125,289.9063 516.5,290.9844 Q517.1875,292.0469 518.5313,292.0469 Q519.1563,292.0469 519.75,291.7813 Q520.3438,291.5 520.9688,290.9219 L520.9688,293.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="532" y="292.1543">A</text>
@@ -88,7 +88,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="549" y="281.1387">long,U</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="504" x2="586" y1="304" y2="304"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="504" x2="586" y1="312" y2="312"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="494" y="355"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="494" y="355"/>
     <ellipse cx="509" cy="371" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M511.9688,376.6406 Q511.3906,376.9375 510.75,377.0781 Q510.1094,377.2344 509.4063,377.2344 Q506.9063,377.2344 505.5781,375.5938 Q504.2656,373.9375 504.2656,370.8125 Q504.2656,367.6875 505.5781,366.0313 Q506.9063,364.375 509.4063,364.375 Q510.1094,364.375 510.75,364.5313 Q511.4063,364.6875 511.9688,364.9844 L511.9688,367.7031 Q511.3438,367.125 510.75,366.8594 Q510.1563,366.5781 509.5313,366.5781 Q508.1875,366.5781 507.5,367.6563 Q506.8125,368.7188 506.8125,370.8125 Q506.8125,372.9063 507.5,373.9844 Q508.1875,375.0469 509.5313,375.0469 Q510.1563,375.0469 510.75,374.7813 Q511.3438,374.5 511.9688,373.9219 L511.9688,376.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="523" y="375.1543">A</text>
@@ -96,7 +96,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="540" y="364.1387">long,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="495" x2="595" y1="387" y2="387"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="495" x2="595" y1="395" y2="395"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="486" y="521"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="486" y="521"/>
     <ellipse cx="501" cy="537" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M503.9688,542.6406 Q503.3906,542.9375 502.75,543.0781 Q502.1094,543.2344 501.4063,543.2344 Q498.9063,543.2344 497.5781,541.5938 Q496.2656,539.9375 496.2656,536.8125 Q496.2656,533.6875 497.5781,532.0313 Q498.9063,530.375 501.4063,530.375 Q502.1094,530.375 502.75,530.5313 Q503.4063,530.6875 503.9688,530.9844 L503.9688,533.7031 Q503.3438,533.125 502.75,532.8594 Q502.1563,532.5781 501.5313,532.5781 Q500.1875,532.5781 499.5,533.6563 Q498.8125,534.7188 498.8125,536.8125 Q498.8125,538.9063 499.5,539.9844 Q500.1875,541.0469 501.5313,541.0469 Q502.1563,541.0469 502.75,540.7813 Q503.3438,540.5 503.9688,539.9219 L503.9688,542.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515" y="541.1543">A</text>
@@ -104,7 +104,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="532" y="530.1387">double,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="487" x2="603" y1="553" y2="553"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="487" x2="603" y1="561" y2="561"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="493.5" y="189"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="493.5" y="189"/>
     <ellipse cx="508.5" cy="205" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M511.4688,210.6406 Q510.8906,210.9375 510.25,211.0781 Q509.6094,211.2344 508.9063,211.2344 Q506.4063,211.2344 505.0781,209.5938 Q503.7656,207.9375 503.7656,204.8125 Q503.7656,201.6875 505.0781,200.0313 Q506.4063,198.375 508.9063,198.375 Q509.6094,198.375 510.25,198.5313 Q510.9063,198.6875 511.4688,198.9844 L511.4688,201.7031 Q510.8438,201.125 510.25,200.8594 Q509.6563,200.5781 509.0313,200.5781 Q507.6875,200.5781 507,201.6563 Q506.3125,202.7188 506.3125,204.8125 Q506.3125,206.9063 507,207.9844 Q507.6875,209.0469 509.0313,209.0469 Q509.6563,209.0469 510.25,208.7813 Q510.8438,208.5 511.4688,207.9219 L511.4688,210.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="522.5" y="209.1543">A</text>
@@ -112,7 +112,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="539.5" y="198.1387">long,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="595.5" y1="221" y2="221"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="595.5" y1="229" y2="229"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="485.5" y="438"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="485.5" y="438"/>
     <ellipse cx="500.5" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M503.4688,459.6406 Q502.8906,459.9375 502.25,460.0781 Q501.6094,460.2344 500.9063,460.2344 Q498.4063,460.2344 497.0781,458.5938 Q495.7656,456.9375 495.7656,453.8125 Q495.7656,450.6875 497.0781,449.0313 Q498.4063,447.375 500.9063,447.375 Q501.6094,447.375 502.25,447.5313 Q502.9063,447.6875 503.4688,447.9844 L503.4688,450.7031 Q502.8438,450.125 502.25,449.8594 Q501.6563,449.5781 501.0313,449.5781 Q499.6875,449.5781 499,450.6563 Q498.3125,451.7188 498.3125,453.8125 Q498.3125,455.9063 499,456.9844 Q499.6875,458.0469 501.0313,458.0469 Q501.6563,458.0469 502.25,457.7813 Q502.8438,457.5 503.4688,456.9219 L503.4688,459.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="514.5" y="458.1543">A</text>
@@ -120,7 +120,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="531.5" y="447.1387">double,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="603.5" y1="470" y2="470"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="603.5" y1="478" y2="478"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="476.5" y="1019"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="476.5" y="1019"/>
     <ellipse cx="491.5" cy="1035" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M494.4688,1040.6406 Q493.8906,1040.9375 493.25,1041.0781 Q492.6094,1041.2344 491.9063,1041.2344 Q489.4063,1041.2344 488.0781,1039.5938 Q486.7656,1037.9375 486.7656,1034.8125 Q486.7656,1031.6875 488.0781,1030.0313 Q489.4063,1028.375 491.9063,1028.375 Q492.6094,1028.375 493.25,1028.5313 Q493.9063,1028.6875 494.4688,1028.9844 L494.4688,1031.7031 Q493.8438,1031.125 493.25,1030.8594 Q492.6563,1030.5781 492.0313,1030.5781 Q490.6875,1030.5781 490,1031.6563 Q489.3125,1032.7188 489.3125,1034.8125 Q489.3125,1036.9063 490,1037.9844 Q490.6875,1039.0469 492.0313,1039.0469 Q492.6563,1039.0469 493.25,1038.7813 Q493.8438,1038.5 494.4688,1037.9219 L494.4688,1040.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="505.5" y="1039.1543">A</text>
@@ -128,7 +128,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="522.5" y="1028.1387">bool,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477.5" x2="612.5" y1="1051" y2="1051"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477.5" x2="612.5" y1="1059" y2="1059"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="419" y="604"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="419" y="604"/>
     <ellipse cx="434" cy="620" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M436.9688,625.6406 Q436.3906,625.9375 435.75,626.0781 Q435.1094,626.2344 434.4063,626.2344 Q431.9063,626.2344 430.5781,624.5938 Q429.2656,622.9375 429.2656,619.8125 Q429.2656,616.6875 430.5781,615.0313 Q431.9063,613.375 434.4063,613.375 Q435.1094,613.375 435.75,613.5313 Q436.4063,613.6875 436.9688,613.9844 L436.9688,616.7031 Q436.3438,616.125 435.75,615.8594 Q435.1563,615.5781 434.5313,615.5781 Q433.1875,615.5781 432.5,616.6563 Q431.8125,617.7188 431.8125,619.8125 Q431.8125,621.9063 432.5,622.9844 Q433.1875,624.0469 434.5313,624.0469 Q435.1563,624.0469 435.75,623.7813 Q436.3438,623.5 436.9688,622.9219 L436.9688,625.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="448" y="624.1543">A</text>
@@ -136,7 +136,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="208" x="465" y="613.1387">float,std::unique_ptr&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="670" y1="636" y2="636"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="670" y1="644" y2="644"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="482" y="770"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="482" y="770"/>
     <ellipse cx="497" cy="786" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M499.9688,791.6406 Q499.3906,791.9375 498.75,792.0781 Q498.1094,792.2344 497.4063,792.2344 Q494.9063,792.2344 493.5781,790.5938 Q492.2656,788.9375 492.2656,785.8125 Q492.2656,782.6875 493.5781,781.0313 Q494.9063,779.375 497.4063,779.375 Q498.1094,779.375 498.75,779.5313 Q499.4063,779.6875 499.9688,779.9844 L499.9688,782.7031 Q499.3438,782.125 498.75,781.8594 Q498.1563,781.5781 497.5313,781.5781 Q496.1875,781.5781 495.5,782.6563 Q494.8125,783.7188 494.8125,785.8125 Q494.8125,787.9063 495.5,788.9844 Q496.1875,790.0469 497.5313,790.0469 Q498.1563,790.0469 498.75,789.7813 Q499.3438,789.5 499.9688,788.9219 L499.9688,791.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="511" y="790.1543">A</text>
@@ -144,7 +144,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="528" y="779.1387">int,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="483" x2="607" y1="802" y2="802"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="483" x2="607" y1="810" y2="810"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="459" y="853"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="459" y="853"/>
     <ellipse cx="474" cy="869" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M476.9688,874.6406 Q476.3906,874.9375 475.75,875.0781 Q475.1094,875.2344 474.4063,875.2344 Q471.9063,875.2344 470.5781,873.5938 Q469.2656,871.9375 469.2656,868.8125 Q469.2656,865.6875 470.5781,864.0313 Q471.9063,862.375 474.4063,862.375 Q475.1094,862.375 475.75,862.5313 Q476.4063,862.6875 476.9688,862.9844 L476.9688,865.7031 Q476.3438,865.125 475.75,864.8594 Q475.1563,864.5781 474.5313,864.5781 Q473.1875,864.5781 472.5,865.6563 Q471.8125,866.7188 471.8125,868.8125 Q471.8125,870.9063 472.5,871.9844 Q473.1875,873.0469 474.5313,873.0469 Q475.1563,873.0469 475.75,872.7813 Q476.3438,872.5 476.9688,871.9219 L476.9688,874.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="488" y="873.1543">A</text>
@@ -152,7 +152,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="128" x="505" y="862.1387">std::string,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="460" x2="630" y1="885" y2="885"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="460" x2="630" y1="893" y2="893"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000640294848487970524" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="476" y="936"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000640294848487970524" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="476" y="936"/>
     <ellipse cx="491" cy="952" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M493.9688,957.6406 Q493.3906,957.9375 492.75,958.0781 Q492.1094,958.2344 491.4063,958.2344 Q488.9063,958.2344 487.5781,956.5938 Q486.2656,954.9375 486.2656,951.8125 Q486.2656,948.6875 487.5781,947.0313 Q488.9063,945.375 491.4063,945.375 Q492.1094,945.375 492.75,945.5313 Q493.4063,945.6875 493.9688,945.9844 L493.9688,948.7031 Q493.3438,948.125 492.75,947.8594 Q492.1563,947.5781 491.5313,947.5781 Q490.1875,947.5781 489.5,948.6563 Q488.8125,949.7188 488.8125,951.8125 Q488.8125,953.9063 489.5,954.9844 Q490.1875,956.0469 491.5313,956.0469 Q492.1563,956.0469 492.75,955.7813 Q493.3438,955.5 493.9688,954.9219 L493.9688,957.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="505" y="956.1543">A</text>
@@ -160,7 +160,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="522" y="945.1387">char,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="613" y1="968" y2="968"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="613" y1="976" y2="976"/>
-    <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="48" id="C_0000139599686497663147" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="465.5" y="687"/>
+    <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="48" id="C_0000139599686497663147" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="465.5" y="687"/>
     <ellipse cx="480.5" cy="703" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M483.4688,708.6406 Q482.8906,708.9375 482.25,709.0781 Q481.6094,709.2344 480.9063,709.2344 Q478.4063,709.2344 477.0781,707.5938 Q475.7656,705.9375 475.7656,702.8125 Q475.7656,699.6875 477.0781,698.0313 Q478.4063,696.375 480.9063,696.375 Q481.6094,696.375 482.25,696.5313 Q482.9063,696.6875 483.4688,696.9844 L483.4688,699.7031 Q482.8438,699.125 482.25,698.8594 Q481.6563,698.5781 481.0313,698.5781 Q479.6875,698.5781 479,699.6563 Q478.3125,700.7188 478.3125,702.8125 Q478.3125,704.9063 479,705.9844 Q479.6875,707.0469 481.0313,707.0469 Q481.6563,707.0469 482.25,706.7813 Q482.8438,706.5 483.4688,705.9219 L483.4688,708.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494.5" y="707.1543">A</text>
@@ -168,116 +168,116 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="511.5" y="696.1387">wchar_t,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="466.5" x2="623.5" y1="719" y2="719"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="466.5" x2="623.5" y1="727" y2="727"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcev72m7hajfx)" height="240.0703" id="C_0001192822659863756768" style="stroke: #A80036; stroke-width: 1.5;" width="259" x="6" y="379"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kxn8im3h2a68)" height="240.0703" id="C_0001192822659863756768" style="stroke: #A80036; stroke-width: 1.5;" width="259" x="6" y="379"/>
       <ellipse cx="127.25" cy="395" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M130.2188,400.6406 Q129.6406,400.9375 129,401.0781 Q128.3594,401.2344 127.6563,401.2344 Q125.1563,401.2344 123.8281,399.5938 Q122.5156,397.9375 122.5156,394.8125 Q122.5156,391.6875 123.8281,390.0313 Q125.1563,388.375 127.6563,388.375 Q128.3594,388.375 129,388.5313 Q129.6563,388.6875 130.2188,388.9844 L130.2188,391.7031 Q129.5938,391.125 129,390.8594 Q128.4063,390.5781 127.7813,390.5781 Q126.4375,390.5781 125.75,391.6563 Q125.0625,392.7188 125.0625,394.8125 Q125.0625,396.9063 125.75,397.9844 Q126.4375,399.0469 127.7813,399.0469 Q128.4063,399.0469 129,398.7813 Q129.5938,398.5 130.2188,397.9219 L130.2188,400.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="147.75" y="399.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="264" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="417"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="419"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="425.2104">bapair : PairPairBA&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="429.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="431.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="438.0151">abool : APtr&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="442.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="444.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="450.8198">aboolfloat : AAPtr&lt;bool,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="455.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="457.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="463.6245">afloat : ASharedPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="468.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="470.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="476.4292">boolstring : A&lt;bool,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="481.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="483.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="489.2339">floatstring : AStringPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="493.8281"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="495.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="502.0386">intstring : AIntString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="506.6328"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="508.6328"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="514.8433">stringstring : AStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="519.4375"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="521.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="527.6479">bstringstring : BStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="532.2422"/>
       <polygon fill="none" points="17,532.2422,21,536.2422,17,540.2422,13,536.2422" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="540.4526">bs : BVector</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="545.0469"/>
       <ellipse cx="17" cy="550.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="553.2573">bs2 : BVector2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="557.8516"/>
       <ellipse cx="17" cy="562.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="566.062">cb : SimpleCallback&lt;ACharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="570.6563"/>
       <ellipse cx="17" cy="575.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="233" x="26" y="578.8667">gcb : GenericCallback&lt;R::AWCharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="583.4609"/>
       <ellipse cx="17" cy="588.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="591.6714">vcb : VoidCallback</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="596.2656"/>
       <ellipse cx="17" cy="601.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="604.4761">vps : VectorPtr&lt;B&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="264" y1="611.0703" y2="611.0703"/>
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index dbae78aa..3e6c38ab 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:365px;height:283px;" version="1.1" viewBox="0 0 365 283" width="365px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19qtfgnbcv425" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1cbybo5ecy2lc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cbybo5ecy2lc)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
       <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cbybo5ecy2lc)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
       <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L16" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L16" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L16" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L16" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cbybo5ecy2lc)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="35" y="136.1543">ns1::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L24" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L24" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cbybo5ecy2lc)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
       <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00015/t00015.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19qtfgnbcv425)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L28" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00015/t00015.cc#L28" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cbybo5ecy2lc)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
       <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index d83ad125..6ebd42e9 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:980px;height:200px;" version="1.1" viewBox="0 0 980 200" width="980px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fszynl8qaye3q" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1g6kscc10wyjd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000214045147845616983" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="367" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0000214045147845616983" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="367" y="129"/>
       <ellipse cx="382" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M384.9688,150.6406 Q384.3906,150.9375 383.75,151.0781 Q383.1094,151.2344 382.4063,151.2344 Q379.9063,151.2344 378.5781,149.5938 Q377.2656,147.9375 377.2656,144.8125 Q377.2656,141.6875 378.5781,140.0313 Q379.9063,138.375 382.4063,138.375 Q383.1094,138.375 383.75,138.5313 Q384.4063,138.6875 384.9688,138.9844 L384.9688,141.7031 Q384.3438,141.125 383.75,140.8594 Q383.1563,140.5781 382.5313,140.5781 Q381.1875,140.5781 380.5,141.6563 Q379.8125,142.7188 379.8125,144.8125 Q379.8125,146.9063 380.5,147.9844 Q381.1875,149.0469 382.5313,149.0469 Q383.1563,149.0469 383.75,148.7813 Q384.3438,148.5 384.9688,147.9219 L384.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="396" y="149.1543">is_numeric&lt;&gt;</text>
@@ -19,8 +19,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="387" y="175.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368" x2="484" y1="181.8047" y2="181.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000722777951198284620" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="869" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0000722777951198284620" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="869" y="8"/>
       <ellipse cx="884.9" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M887.8688,29.6406 Q887.2906,29.9375 886.65,30.0781 Q886.0094,30.2344 885.3063,30.2344 Q882.8063,30.2344 881.4781,28.5938 Q880.1656,26.9375 880.1656,23.8125 Q880.1656,20.6875 881.4781,19.0313 Q882.8063,17.375 885.3063,17.375 Q886.0094,17.375 886.65,17.5313 Q887.3063,17.6875 887.8688,17.9844 L887.8688,20.7031 Q887.2438,20.125 886.65,19.8594 Q886.0563,19.5781 885.4313,19.5781 Q884.0875,19.5781 883.4,20.6563 Q882.7125,21.7188 882.7125,23.8125 Q882.7125,25.9063 883.4,26.9844 Q884.0875,28.0469 885.4313,28.0469 Q886.0563,28.0469 886.65,27.7813 Q887.2438,27.5 887.8688,26.9219 L887.8688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="899.1" y="28.1543">is_numeric</text>
@@ -29,8 +29,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="889" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="870" x2="968" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
@@ -41,8 +41,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="26" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
       <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
@@ -53,8 +53,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="191" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
       <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
@@ -65,8 +65,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="356.5" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
       <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
@@ -77,8 +77,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="571" y="54.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="60.8047" y2="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fszynl8qaye3q)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1g6kscc10wyjd)" height="60.8047" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
       <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index b6dcb910..029f4658 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:799px;height:256px;" version="1.1" viewBox="0 0 799 256" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxhe9tg31vu7k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f15hcdd2ipnbzm" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,127 +9,127 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
       <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
       <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
       <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
       <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L20" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L20" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L20" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L20" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
       <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L23" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L23" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
       <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L26" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L26" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L26" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L26" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
       <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L29" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L29" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L29" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L29" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
       <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L32" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L32" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L32" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L32" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
       <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L35" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L35" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L35" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L35" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
       <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxhe9tg31vu7k)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="196.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f15hcdd2ipnbzm)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="196.5" y="8"/>
       <ellipse cx="377.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M380.7188,29.6406 Q380.1406,29.9375 379.5,30.0781 Q378.8594,30.2344 378.1563,30.2344 Q375.6563,30.2344 374.3281,28.5938 Q373.0156,26.9375 373.0156,23.8125 Q373.0156,20.6875 374.3281,19.0313 Q375.6563,17.375 378.1563,17.375 Q378.8594,17.375 379.5,17.5313 Q380.1563,17.6875 380.7188,17.9844 L380.7188,20.7031 Q380.0938,20.125 379.5,19.8594 Q378.9063,19.5781 378.2813,19.5781 Q376.9375,19.5781 376.25,20.6563 Q375.5625,21.7188 375.5625,23.8125 Q375.5625,25.9063 376.25,26.9844 Q376.9375,28.0469 378.2813,28.0469 Q378.9063,28.0469 379.5,27.7813 Q380.0938,27.5 380.7188,26.9219 L380.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="398.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="197.5" x2="574.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L49" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L49" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="216.5" y="54.2104">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L50" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L50" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="216.5" y="67.0151">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L51" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L51" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="216.5" y="79.8198">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L52" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00017/t00017.cc#L52" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="216.5" y="92.6245">some_int_reference : int &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="197.5" x2="574.5" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index 832d1cad..540bf03b 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="371px" preserveAspectRatio="none" style="width:262px;height:371px;" version="1.1" viewBox="0 0 262 371" width="262px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1tokw2976wmaj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1sr3dya0adjdr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,18 +9,18 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tokw2976wmaj)" height="99.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sr3dya0adjdr)" height="99.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="13" y="8"/>
       <ellipse cx="87.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M90.2188,29.6406 Q89.6406,29.9375 89,30.0781 Q88.3594,30.2344 87.6563,30.2344 Q85.1563,30.2344 83.8281,28.5938 Q82.5156,26.9375 82.5156,23.8125 Q82.5156,20.6875 83.8281,19.0313 Q85.1563,17.375 87.6563,17.375 Q88.3594,17.375 89,17.5313 Q89.6563,17.6875 90.2188,17.9844 L90.2188,20.7031 Q89.5938,20.125 89,19.8594 Q88.4063,19.5781 87.7813,19.5781 Q86.4375,19.5781 85.75,20.6563 Q85.0625,21.7188 85.0625,23.8125 Q85.0625,25.9063 85.75,26.9844 Q86.4375,28.0469 87.7813,28.0469 Q88.4063,28.0469 89,27.7813 Q89.5938,27.5 90.2188,26.9219 L90.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="107.75" y="28.1543">impl::widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="243" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="21" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="33" y="54.2104">n : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="243" y1="60.8047" y2="60.8047"/>
@@ -30,18 +30,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="33" y="87.8198">draw(const widget &amp; w) : void</text>
     <ellipse cx="24" cy="97.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="33" y="100.6245">widget(int n) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tokw2976wmaj)" height="176.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sr3dya0adjdr)" height="176.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="184"/>
       <ellipse cx="103.75" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M106.7188,205.6406 Q106.1406,205.9375 105.5,206.0781 Q104.8594,206.2344 104.1563,206.2344 Q101.6563,206.2344 100.3281,204.5938 Q99.0156,202.9375 99.0156,199.8125 Q99.0156,196.6875 100.3281,195.0313 Q101.6563,193.375 104.1563,193.375 Q104.8594,193.375 105.5,193.5313 Q106.1563,193.6875 106.7188,193.9844 L106.7188,196.7031 Q106.0938,196.125 105.5,195.8594 Q104.9063,195.5781 104.2813,195.5781 Q102.9375,195.5781 102.25,196.6563 Q101.5625,197.7188 101.5625,199.8125 Q101.5625,201.9063 102.25,202.9844 Q102.9375,204.0469 104.2813,204.0469 Q104.9063,204.0469 105.5,203.7813 Q106.0938,203.5 106.7188,202.9219 L106.7188,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="124.25" y="204.1543">widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="222"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="230.2104">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="236.8047" y2="236.8047"/>
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index 4ee8a52d..8a4273b2 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="685px" preserveAspectRatio="none" style="width:781px;height:685px;" version="1.1" viewBox="0 0 781 685" width="781px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f75rs0ovcv4b9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1l8qltmdm6n17" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="99.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="163" x="194.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="99.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="163" x="194.5" y="8"/>
       <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="276.75" y="28.1543">Base</text>
@@ -25,8 +25,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="202.5" y="94.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="214.5" y="100.6245">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="443" y="601"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="443" y="601"/>
       <ellipse cx="458" cy="617" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M460.9688,622.6406 Q460.3906,622.9375 459.75,623.0781 Q459.1094,623.2344 458.4063,623.2344 Q455.9063,623.2344 454.5781,621.5938 Q453.2656,619.9375 453.2656,616.8125 Q453.2656,613.6875 454.5781,612.0313 Q455.9063,610.375 458.4063,610.375 Q459.1094,610.375 459.75,610.5313 Q460.4063,610.6875 460.9688,610.9844 L460.9688,613.7031 Q460.3438,613.125 459.75,612.8594 Q459.1563,612.5781 458.5313,612.5781 Q457.1875,612.5781 456.5,613.6563 Q455.8125,614.7188 455.8125,616.8125 Q455.8125,618.9063 456.5,619.9844 Q457.1875,621.0469 458.5313,621.0469 Q459.1563,621.0469 459.75,620.7813 Q460.3438,620.5 460.9688,619.9219 L460.9688,622.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="472" y="621.1543">Layer1</text>
@@ -39,8 +39,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="451" y="661.8047"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="463" y="668.0151">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="187.5" y="479"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="187.5" y="479"/>
       <ellipse cx="214.65" cy="495" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M217.6188,500.6406 Q217.0406,500.9375 216.4,501.0781 Q215.7594,501.2344 215.0563,501.2344 Q212.5563,501.2344 211.2281,499.5938 Q209.9156,497.9375 209.9156,494.8125 Q209.9156,491.6875 211.2281,490.0313 Q212.5563,488.375 215.0563,488.375 Q215.7594,488.375 216.4,488.5313 Q217.0563,488.6875 217.6188,488.9844 L217.6188,491.7031 Q216.9938,491.125 216.4,490.8594 Q215.8063,490.5781 215.1813,490.5781 Q213.8375,490.5781 213.15,491.6563 Q212.4625,492.7188 212.4625,494.8125 Q212.4625,496.9063 213.15,497.9844 Q213.8375,499.0469 215.1813,499.0469 Q215.8063,499.0469 216.4,498.7813 Q216.9938,498.5 217.6188,497.9219 L217.6188,500.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="231.35" y="499.1543">Layer2</text>
@@ -51,8 +51,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="195.5" y="527"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="207.5" y="533.2104">all_calls_count() const : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="277"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="277"/>
       <ellipse cx="21" cy="293" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,298.6406 Q23.3906,298.9375 22.75,299.0781 Q22.1094,299.2344 21.4063,299.2344 Q18.9063,299.2344 17.5781,297.5938 Q16.2656,295.9375 16.2656,292.8125 Q16.2656,289.6875 17.5781,288.0313 Q18.9063,286.375 21.4063,286.375 Q22.1094,286.375 22.75,286.5313 Q23.4063,286.6875 23.9688,286.9844 L23.9688,289.7031 Q23.3438,289.125 22.75,288.8594 Q22.1563,288.5781 21.5313,288.5781 Q20.1875,288.5781 19.5,289.6563 Q18.8125,290.7188 18.8125,292.8125 Q18.8125,294.9063 19.5,295.9844 Q20.1875,297.0469 21.5313,297.0469 Q22.1563,297.0469 22.75,296.7813 Q23.3438,296.5 23.9688,295.9219 L23.9688,298.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="35" y="297.1543">Layer3</text>
@@ -60,18 +60,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="85" y="286.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="309" y2="309"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="315"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="317"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="323.2104">m_m1_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="327.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="329.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="336.0151">m_m2_calls : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="342.6094" y2="342.6094"/>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="26" y="382.4292">m1_calls() const : int</text>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="389.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="26" y="395.2339">m2_calls() const : int</text>
-    <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="222.5" y="168"/>
+    <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="222.5" y="168"/>
     <ellipse cx="237.5" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M240.4688,189.6406 Q239.8906,189.9375 239.25,190.0781 Q238.6094,190.2344 237.9063,190.2344 Q235.4063,190.2344 234.0781,188.5938 Q232.7656,186.9375 232.7656,183.8125 Q232.7656,180.6875 234.0781,179.0313 Q235.4063,177.375 237.9063,177.375 Q238.6094,177.375 239.25,177.5313 Q239.9063,177.6875 240.4688,177.9844 L240.4688,180.7031 Q239.8438,180.125 239.25,179.8594 Q238.6563,179.5781 238.0313,179.5781 Q236.6875,179.5781 236,180.6563 Q235.3125,181.7188 235.3125,183.8125 Q235.3125,185.9063 236,186.9844 Q236.6875,188.0469 238.0313,188.0469 Q238.6563,188.0469 239.25,187.7813 Q239.8438,187.5 240.4688,186.9219 L240.4688,189.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="251.5" y="188.1543">Layer3</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="301.5" y="177.1387">Base</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="223.5" x2="328.5" y1="200" y2="200"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="223.5" x2="328.5" y1="208" y2="208"/>
-    <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="315.5"/>
+    <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="315.5"/>
     <ellipse cx="206" cy="331.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M208.9688,337.1406 Q208.3906,337.4375 207.75,337.5781 Q207.1094,337.7344 206.4063,337.7344 Q203.9063,337.7344 202.5781,336.0938 Q201.2656,334.4375 201.2656,331.3125 Q201.2656,328.1875 202.5781,326.5313 Q203.9063,324.875 206.4063,324.875 Q207.1094,324.875 207.75,325.0313 Q208.4063,325.1875 208.9688,325.4844 L208.9688,328.2031 Q208.3438,327.625 207.75,327.3594 Q207.1563,327.0781 206.5313,327.0781 Q205.1875,327.0781 204.5,328.1563 Q203.8125,329.2188 203.8125,331.3125 Q203.8125,333.4063 204.5,334.4844 Q205.1875,335.5469 206.5313,335.5469 Q207.1563,335.5469 207.75,335.2813 Q208.3438,335 208.9688,334.4219 L208.9688,337.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="220" y="335.6543">Layer2</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="270" y="324.6387">Layer3&lt;Base&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="347.5" y2="347.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="355.5" y2="355.5"/>
-    <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="401.5" y="485.5"/>
+    <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="401.5" y="485.5"/>
     <ellipse cx="416.5" cy="501.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M419.4688,507.1406 Q418.8906,507.4375 418.25,507.5781 Q417.6094,507.7344 416.9063,507.7344 Q414.4063,507.7344 413.0781,506.0938 Q411.7656,504.4375 411.7656,501.3125 Q411.7656,498.1875 413.0781,496.5313 Q414.4063,494.875 416.9063,494.875 Q417.6094,494.875 418.25,495.0313 Q418.9063,495.1875 419.4688,495.4844 L419.4688,498.2031 Q418.8438,497.625 418.25,497.3594 Q417.6563,497.0781 417.0313,497.0781 Q415.6875,497.0781 415,498.1563 Q414.3125,499.2188 414.3125,501.3125 Q414.3125,503.4063 415,504.4844 Q415.6875,505.5469 417.0313,505.5469 Q417.6563,505.5469 418.25,505.2813 Q418.8438,505 419.4688,504.4219 L419.4688,507.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="430.5" y="505.6543">Layer1</text>
@@ -107,18 +107,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="480.5" y="494.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="402.5" x2="633.5" y1="517.5" y2="517.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="402.5" x2="633.5" y1="525.5" y2="525.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f75rs0ovcv4b9)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l8qltmdm6n17)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="309"/>
       <ellipse cx="574.75" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M577.7188,330.6406 Q577.1406,330.9375 576.5,331.0781 Q575.8594,331.2344 575.1563,331.2344 Q572.6563,331.2344 571.3281,329.5938 Q570.0156,327.9375 570.0156,324.8125 Q570.0156,321.6875 571.3281,320.0313 Q572.6563,318.375 575.1563,318.375 Q575.8594,318.375 576.5,318.5313 Q577.1563,318.6875 577.7188,318.9844 L577.7188,321.7031 Q577.0938,321.125 576.5,320.8594 Q575.9063,320.5781 575.2813,320.5781 Q573.9375,320.5781 573.25,321.6563 Q572.5625,322.7188 572.5625,324.8125 Q572.5625,326.9063 573.25,327.9844 Q573.9375,329.0469 575.2813,329.0469 Q575.9063,329.0469 576.5,328.7813 Q577.0938,328.5 577.7188,327.9219 L577.7188,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="595.25" y="329.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="341" y2="341"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402" y="347"/>
       <ellipse cx="407" cy="352" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="416" y="355.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="361.8047" y2="361.8047"/>
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 01c77b71..b04412e3 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="870px" preserveAspectRatio="none" style="width:754px;height:870px;" version="1.1" viewBox="0 0 754 870" width="754px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1kiirtbhanmbd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1frnz4o35ish2" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="297.33" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="73.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="297.33" y="142"/>
       <ellipse cx="361.58" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.6894,153.3438 L360.5331,158.4219 L362.8613,158.4219 L361.6894,153.3438 Z M360.205,151.1094 L363.1894,151.1094 L366.5488,163.5 L364.0956,163.5 L363.33,160.4375 L360.0488,160.4375 L359.2988,163.5 L356.8613,163.5 L360.205,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="382.08" y="162.1543">ProductA</text>
@@ -21,8 +21,8 @@
       <ellipse cx="308.33" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="317.33" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="169.33" y="276"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="169.33" y="276"/>
       <ellipse cx="218.08" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.0488,297.6406 Q220.4706,297.9375 219.83,298.0781 Q219.1894,298.2344 218.4863,298.2344 Q215.9863,298.2344 214.6581,296.5938 Q213.3456,294.9375 213.3456,291.8125 Q213.3456,288.6875 214.6581,287.0313 Q215.9863,285.375 218.4863,285.375 Q219.1894,285.375 219.83,285.5313 Q220.4863,285.6875 221.0488,285.9844 L221.0488,288.7031 Q220.4238,288.125 219.83,287.8594 Q219.2363,287.5781 218.6113,287.5781 Q217.2675,287.5781 216.58,288.6563 Q215.8925,289.7188 215.8925,291.8125 Q215.8925,293.9063 216.58,294.9844 Q217.2675,296.0469 218.6113,296.0469 Q219.2363,296.0469 219.83,295.7813 Q220.4238,295.5 221.0488,294.9219 L221.0488,297.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="238.58" y="296.1543">ProductA1</text>
@@ -31,8 +31,8 @@
       <ellipse cx="180.33" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="189.33" y="330.2104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="518.33" y="403.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="518.33" y="403.5"/>
       <ellipse cx="567.08" cy="419.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M570.0488,425.1406 Q569.4706,425.4375 568.83,425.5781 Q568.1894,425.7344 567.4863,425.7344 Q564.9863,425.7344 563.6581,424.0938 Q562.3456,422.4375 562.3456,419.3125 Q562.3456,416.1875 563.6581,414.5313 Q564.9863,412.875 567.4863,412.875 Q568.1894,412.875 568.83,413.0313 Q569.4863,413.1875 570.0488,413.4844 L570.0488,416.2031 Q569.4238,415.625 568.83,415.3594 Q568.2363,415.0781 567.6113,415.0781 Q566.2675,415.0781 565.58,416.1563 Q564.8925,417.2188 564.8925,419.3125 Q564.8925,421.4063 565.58,422.4844 Q566.2675,423.5469 567.6113,423.5469 Q568.2363,423.5469 568.83,423.2813 Q569.4238,423 570.0488,422.4219 L570.0488,425.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="587.58" y="423.6543">ProductA2</text>
@@ -41,8 +41,8 @@
       <ellipse cx="529.33" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="538.33" y="457.7104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="22.33" y="531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="73.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="22.33" y="531"/>
       <ellipse cx="87.58" cy="547" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.6894,542.3438 L86.5331,547.4219 L88.8613,547.4219 L87.6894,542.3438 Z M86.205,540.1094 L89.1894,540.1094 L92.5488,552.5 L90.0956,552.5 L89.33,549.4375 L86.0488,549.4375 L85.2988,552.5 L82.8613,552.5 L86.205,540.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="108.08" y="551.1543">ProductB</text>
@@ -53,8 +53,8 @@
       <ellipse cx="33.33" cy="594.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="42.33" y="598.0151">buy(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="240.33" y="665"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="240.33" y="665"/>
       <ellipse cx="289.08" cy="681" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M292.0488,686.6406 Q291.4706,686.9375 290.83,687.0781 Q290.1894,687.2344 289.4863,687.2344 Q286.9863,687.2344 285.6581,685.5938 Q284.3456,683.9375 284.3456,680.8125 Q284.3456,677.6875 285.6581,676.0313 Q286.9863,674.375 289.4863,674.375 Q290.1894,674.375 290.83,674.5313 Q291.4863,674.6875 292.0488,674.9844 L292.0488,677.7031 Q291.4238,677.125 290.83,676.8594 Q290.2363,676.5781 289.6113,676.5781 Q288.2675,676.5781 287.58,677.6563 Q286.8925,678.7188 286.8925,680.8125 Q286.8925,682.9063 287.58,683.9844 Q288.2675,685.0469 289.6113,685.0469 Q290.2363,685.0469 290.83,684.7813 Q291.4238,684.5 292.0488,683.9219 L292.0488,686.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="309.58" y="685.1543">ProductB1</text>
@@ -63,8 +63,8 @@
       <ellipse cx="251.33" cy="716" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="260.33" y="719.2104">buy(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="34.33" y="665"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="34.33" y="665"/>
       <ellipse cx="83.08" cy="681" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M86.0488,686.6406 Q85.4706,686.9375 84.83,687.0781 Q84.1894,687.2344 83.4863,687.2344 Q80.9863,687.2344 79.6581,685.5938 Q78.3456,683.9375 78.3456,680.8125 Q78.3456,677.6875 79.6581,676.0313 Q80.9863,674.375 83.4863,674.375 Q84.1894,674.375 84.83,674.5313 Q85.4863,674.6875 86.0488,674.9844 L86.0488,677.7031 Q85.4238,677.125 84.83,676.8594 Q84.2363,676.5781 83.6113,676.5781 Q82.2675,676.5781 81.58,677.6563 Q80.8925,678.7188 80.8925,680.8125 Q80.8925,682.9063 81.58,683.9844 Q82.2675,685.0469 83.6113,685.0469 Q84.2363,685.0469 84.83,684.7813 Q85.4238,684.5 86.0488,683.9219 L86.0488,686.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="103.58" y="685.1543">ProductB2</text>
@@ -73,8 +73,8 @@
       <ellipse cx="45.33" cy="716" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="54.33" y="719.2104">buy(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="103.83" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="103.83" y="8"/>
       <ellipse cx="201.08" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M201.1894,19.3438 L200.0331,24.4219 L202.3612,24.4219 L201.1894,19.3438 Z M199.705,17.1094 L202.6894,17.1094 L206.0487,29.5 L203.5956,29.5 L202.83,26.4375 L199.5487,26.4375 L198.7987,29.5 L196.3612,29.5 L199.705,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="221.58" y="28.1543">AbstractFactory</text>
@@ -85,8 +85,8 @@
       <ellipse cx="114.83" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="123.83" y="75.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="114.83" y="397"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="114.83" y="397"/>
       <ellipse cx="223.58" cy="413" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.5487,418.6406 Q225.9706,418.9375 225.33,419.0781 Q224.6894,419.2344 223.9862,419.2344 Q221.4862,419.2344 220.1581,417.5938 Q218.8456,415.9375 218.8456,412.8125 Q218.8456,409.6875 220.1581,408.0313 Q221.4862,406.375 223.9862,406.375 Q224.6894,406.375 225.33,406.5313 Q225.9862,406.6875 226.5487,406.9844 L226.5487,409.7031 Q225.9237,409.125 225.33,408.8594 Q224.7362,408.5781 224.1112,408.5781 Q222.7675,408.5781 222.08,409.6563 Q221.3925,410.7188 221.3925,412.8125 Q221.3925,414.9063 222.08,415.9844 Q222.7675,417.0469 224.1112,417.0469 Q224.7362,417.0469 225.33,416.7813 Q225.9237,416.5 226.5487,415.9219 L226.5487,418.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="244.08" y="417.1543">Factory1</text>
@@ -97,8 +97,8 @@
       <ellipse cx="125.83" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="134.83" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kiirtbhanmbd)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="324.83" y="786"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1frnz4o35ish2)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="324.83" y="786"/>
       <ellipse cx="433.58" cy="802" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.5488,807.6406 Q435.9706,807.9375 435.33,808.0781 Q434.6894,808.2344 433.9863,808.2344 Q431.4863,808.2344 430.1581,806.5938 Q428.8456,804.9375 428.8456,801.8125 Q428.8456,798.6875 430.1581,797.0313 Q431.4863,795.375 433.9863,795.375 Q434.6894,795.375 435.33,795.5313 Q435.9863,795.6875 436.5488,795.9844 L436.5488,798.7031 Q435.9238,798.125 435.33,797.8594 Q434.7363,797.5781 434.1113,797.5781 Q432.7675,797.5781 432.08,798.6563 Q431.3925,799.7188 431.3925,801.8125 Q431.3925,803.9063 432.08,804.9844 Q432.7675,806.0469 434.1113,806.0469 Q434.7363,806.0469 435.33,805.7813 Q435.9238,805.5 436.5488,804.9219 L436.5488,807.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="454.08" y="806.1543">Factory2</text>
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 623b8745..3b2841eb 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:990px;height:493px;" version="1.1" viewBox="0 0 990 493" width="990px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lgp47vrnjaj8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fdncmsmxqqffx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="86.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="86.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="142"/>
       <ellipse cx="469.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.3594,153.3438 L468.2031,158.4219 L470.5313,158.4219 L469.3594,153.3438 Z M467.875,151.1094 L470.8594,151.1094 L474.2188,163.5 L471.7656,163.5 L471,160.4375 L467.7188,160.4375 L466.9688,163.5 L464.5313,163.5 L467.875,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="162.1543">Visitor</text>
@@ -23,8 +23,8 @@
       <ellipse cx="379" cy="218.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="221.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="288"/>
       <ellipse cx="202.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M205.7188,309.6406 Q205.1406,309.9375 204.5,310.0781 Q203.8594,310.2344 203.1563,310.2344 Q200.6563,310.2344 199.3281,308.5938 Q198.0156,306.9375 198.0156,303.8125 Q198.0156,300.6875 199.3281,299.0313 Q200.6563,297.375 203.1563,297.375 Q203.8594,297.375 204.5,297.5313 Q205.1563,297.6875 205.7188,297.9844 L205.7188,300.7031 Q205.0938,300.125 204.5,299.8594 Q203.9063,299.5781 203.2813,299.5781 Q201.9375,299.5781 201.25,300.6563 Q200.5625,301.7188 200.5625,303.8125 Q200.5625,305.9063 201.25,306.9844 Q201.9375,308.0469 203.2813,308.0469 Q203.9063,308.0469 204.5,307.7813 Q205.0938,307.5 205.7188,306.9219 L205.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="308.1543">Visitor1</text>
@@ -35,8 +35,8 @@
       <ellipse cx="128" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="288"/>
       <ellipse cx="464.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.7188,309.6406 Q467.1406,309.9375 466.5,310.0781 Q465.8594,310.2344 465.1563,310.2344 Q462.6563,310.2344 461.3281,308.5938 Q460.0156,306.9375 460.0156,303.8125 Q460.0156,300.6875 461.3281,299.0313 Q462.6563,297.375 465.1563,297.375 Q465.8594,297.375 466.5,297.5313 Q467.1563,297.6875 467.7188,297.9844 L467.7188,300.7031 Q467.0938,300.125 466.5,299.8594 Q465.9063,299.5781 465.2813,299.5781 Q463.9375,299.5781 463.25,300.6563 Q462.5625,301.7188 462.5625,303.8125 Q462.5625,305.9063 463.25,306.9844 Q463.9375,308.0469 465.2813,308.0469 Q465.9063,308.0469 466.5,307.7813 Q467.0938,307.5 467.7188,306.9219 L467.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="308.1543">Visitor2</text>
@@ -47,8 +47,8 @@
       <ellipse cx="390" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="288"/>
       <ellipse cx="726.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M729.7188,309.6406 Q729.1406,309.9375 728.5,310.0781 Q727.8594,310.2344 727.1563,310.2344 Q724.6563,310.2344 723.3281,308.5938 Q722.0156,306.9375 722.0156,303.8125 Q722.0156,300.6875 723.3281,299.0313 Q724.6563,297.375 727.1563,297.375 Q727.8594,297.375 728.5,297.5313 Q729.1563,297.6875 729.7188,297.9844 L729.7188,300.7031 Q729.0938,300.125 728.5,299.8594 Q727.9063,299.5781 727.2813,299.5781 Q725.9375,299.5781 725.25,300.6563 Q724.5625,301.7188 724.5625,303.8125 Q724.5625,305.9063 725.25,306.9844 Q725.9375,308.0469 727.2813,308.0469 Q727.9063,308.0469 728.5,307.7813 Q729.0938,307.5 729.7188,306.9219 L729.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="308.1543">Visitor3</text>
@@ -59,8 +59,8 @@
       <ellipse cx="652" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="73.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="73.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
       <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
@@ -71,8 +71,8 @@
       <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="422"/>
       <ellipse cx="130.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M133.2188,443.6406 Q132.6406,443.9375 132,444.0781 Q131.3594,444.2344 130.6563,444.2344 Q128.1563,444.2344 126.8281,442.5938 Q125.5156,440.9375 125.5156,437.8125 Q125.5156,434.6875 126.8281,433.0313 Q128.1563,431.375 130.6563,431.375 Q131.3594,431.375 132,431.5313 Q132.6563,431.6875 133.2188,431.9844 L133.2188,434.7031 Q132.5938,434.125 132,433.8594 Q131.4063,433.5781 130.7813,433.5781 Q129.4375,433.5781 128.75,434.6563 Q128.0625,435.7188 128.0625,437.8125 Q128.0625,439.9063 128.75,440.9844 Q129.4375,442.0469 130.7813,442.0469 Q131.4063,442.0469 132,441.7813 Q132.5938,441.5 133.2188,440.9219 L133.2188,443.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="442.1543">A</text>
@@ -81,8 +81,8 @@
       <ellipse cx="17" cy="473" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="476.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lgp47vrnjaj8)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdncmsmxqqffx)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="422"/>
       <ellipse cx="838.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.2188,443.6406 Q840.6406,443.9375 840,444.0781 Q839.3594,444.2344 838.6563,444.2344 Q836.1563,444.2344 834.8281,442.5938 Q833.5156,440.9375 833.5156,437.8125 Q833.5156,434.6875 834.8281,433.0313 Q836.1563,431.375 838.6563,431.375 Q839.3594,431.375 840,431.5313 Q840.6563,431.6875 841.2188,431.9844 L841.2188,434.7031 Q840.5938,434.125 840,433.8594 Q839.4063,433.5781 838.7813,433.5781 Q837.4375,433.5781 836.75,434.6563 Q836.0625,435.7188 836.0625,437.8125 Q836.0625,439.9063 836.75,440.9844 Q837.4375,442.0469 838.7813,442.0469 Q839.4063,442.0469 840,441.7813 Q840.5938,441.5 841.2188,440.9219 L841.2188,443.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="442.1543">B</text>
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index cc6ca49e..9a4059cd 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="238px" preserveAspectRatio="none" style="width:290px;height:238px;" version="1.1" viewBox="0 0 290 238" width="290px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f6sdjs0aiyflj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1fulxclfrkfbq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6sdjs0aiyflj)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fulxclfrkfbq)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
       <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
@@ -23,8 +23,8 @@
       <polygon fill="#FFFF44" points="69.5,79.6094,73.5,83.6094,69.5,87.6094,65.5,83.6094" style="stroke: #B38D22; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="87.8198">method2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6sdjs0aiyflj)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fulxclfrkfbq)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
       <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
@@ -35,8 +35,8 @@
       <polygon fill="#FFFF44" points="17,212.8047,21,216.8047,17,220.8047,13,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="221.0151">method2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f6sdjs0aiyflj)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fulxclfrkfbq)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
       <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index e84d99a3..29abdd7a 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="377px" preserveAspectRatio="none" style="width:456px;height:377px;" version="1.1" viewBox="0 0 456 377" width="456px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1l8xh7dwp1nsa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10wti1duw0w3g" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="73.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="134.5" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10wti1duw0w3g)" height="73.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="134.5" y="171"/>
       <ellipse cx="194.25" cy="187" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.3594,182.3438 L193.2031,187.4219 L195.5313,187.4219 L194.3594,182.3438 Z M192.875,180.1094 L195.8594,180.1094 L199.2188,192.5 L196.7656,192.5 L196,189.4375 L192.7188,189.4375 L191.9688,192.5 L189.5313,192.5 L192.875,180.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="191.1543">Strategy</text>
@@ -21,8 +21,8 @@
       <ellipse cx="145.5" cy="234.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="154.5" y="238.0151">algorithm() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10wti1duw0w3g)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/>
       <ellipse cx="34.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M37.4688,327.6406 Q36.8906,327.9375 36.25,328.0781 Q35.6094,328.2344 34.9063,328.2344 Q32.4063,328.2344 31.0781,326.5938 Q29.7656,324.9375 29.7656,321.8125 Q29.7656,318.6875 31.0781,317.0313 Q32.4063,315.375 34.9063,315.375 Q35.6094,315.375 36.25,315.5313 Q36.9063,315.6875 37.4688,315.9844 L37.4688,318.7031 Q36.8438,318.125 36.25,317.8594 Q35.6563,317.5781 35.0313,317.5781 Q33.6875,317.5781 33,318.6563 Q32.3125,319.7188 32.3125,321.8125 Q32.3125,323.9063 33,324.9844 Q33.6875,326.0469 35.0313,326.0469 Q35.6563,326.0469 36.25,325.7813 Q36.8438,325.5 37.4688,324.9219 L37.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="326.1543">StrategyA</text>
@@ -31,8 +31,8 @@
       <ellipse cx="17" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10wti1duw0w3g)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/>
       <ellipse cx="192.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.4688,327.6406 Q194.8906,327.9375 194.25,328.0781 Q193.6094,328.2344 192.9063,328.2344 Q190.4063,328.2344 189.0781,326.5938 Q187.7656,324.9375 187.7656,321.8125 Q187.7656,318.6875 189.0781,317.0313 Q190.4063,315.375 192.9063,315.375 Q193.6094,315.375 194.25,315.5313 Q194.9063,315.6875 195.4688,315.9844 L195.4688,318.7031 Q194.8438,318.125 194.25,317.8594 Q193.6563,317.5781 193.0313,317.5781 Q191.6875,317.5781 191,318.6563 Q190.3125,319.7188 190.3125,321.8125 Q190.3125,323.9063 191,324.9844 Q191.6875,326.0469 193.0313,326.0469 Q193.6563,326.0469 194.25,325.7813 Q194.8438,325.5 195.4688,324.9219 L195.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="326.1543">StrategyB</text>
@@ -41,8 +41,8 @@
       <ellipse cx="175" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10wti1duw0w3g)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/>
       <ellipse cx="350.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M353.4688,327.6406 Q352.8906,327.9375 352.25,328.0781 Q351.6094,328.2344 350.9063,328.2344 Q348.4063,328.2344 347.0781,326.5938 Q345.7656,324.9375 345.7656,321.8125 Q345.7656,318.6875 347.0781,317.0313 Q348.4063,315.375 350.9063,315.375 Q351.6094,315.375 352.25,315.5313 Q352.9063,315.6875 353.4688,315.9844 L353.4688,318.7031 Q352.8438,318.125 352.25,317.8594 Q351.6563,317.5781 351.0313,317.5781 Q349.6875,317.5781 349,318.6563 Q348.3125,319.7188 348.3125,321.8125 Q348.3125,323.9063 349,324.9844 Q349.6875,326.0469 351.0313,326.0469 Q351.6563,326.0469 352.25,325.7813 Q352.8438,325.5 353.4688,324.9219 L353.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="326.1543">StrategyC</text>
@@ -51,18 +51,18 @@
       <ellipse cx="333" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1l8xh7dwp1nsa)" height="86.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10wti1duw0w3g)" height="86.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
       <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="54.2104">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index 9b835b4b..7f4680ca 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="281px" preserveAspectRatio="none" style="width:542px;height:281px;" version="1.1" viewBox="0 0 542 281" width="542px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgl108beyvrp8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ck0gaj3c42z" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="86.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="245.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ck0gaj3c42z)" height="86.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="245.5" y="8"/>
       <ellipse cx="290.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M290.8594,19.3438 L289.7031,24.4219 L292.0313,24.4219 L290.8594,19.3438 Z M289.375,17.1094 L292.3594,17.1094 L295.7188,29.5 L293.2656,29.5 L292.5,26.4375 L289.2188,26.4375 L288.4688,29.5 L286.0313,29.5 L289.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="311.25" y="28.1543">Target</text>
@@ -23,8 +23,8 @@
       <ellipse cx="256.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="265.5" y="87.8198">m2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ck0gaj3c42z)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/>
       <ellipse cx="23.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,205.1406 Q26.0906,205.4375 25.45,205.5781 Q24.8094,205.7344 24.1063,205.7344 Q21.6063,205.7344 20.2781,204.0938 Q18.9656,202.4375 18.9656,199.3125 Q18.9656,196.1875 20.2781,194.5313 Q21.6063,192.875 24.1063,192.875 Q24.8094,192.875 25.45,193.0313 Q26.1063,193.1875 26.6688,193.4844 L26.6688,196.2031 Q26.0438,195.625 25.45,195.3594 Q24.8563,195.0781 24.2313,195.0781 Q22.8875,195.0781 22.2,196.1563 Q21.5125,197.2188 21.5125,199.3125 Q21.5125,201.4063 22.2,202.4844 Q22.8875,203.5469 24.2313,203.5469 Q24.8563,203.5469 25.45,203.2813 Q26.0438,203 26.6688,202.4219 L26.6688,205.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="203.6543">Target1</text>
@@ -35,8 +35,8 @@
       <ellipse cx="17" cy="247.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="250.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ck0gaj3c42z)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/>
       <ellipse cx="145.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.6688,205.1406 Q148.0906,205.4375 147.45,205.5781 Q146.8094,205.7344 146.1063,205.7344 Q143.6063,205.7344 142.2781,204.0938 Q140.9656,202.4375 140.9656,199.3125 Q140.9656,196.1875 142.2781,194.5313 Q143.6063,192.875 146.1063,192.875 Q146.8094,192.875 147.45,193.0313 Q148.1063,193.1875 148.6688,193.4844 L148.6688,196.2031 Q148.0438,195.625 147.45,195.3594 Q146.8563,195.0781 146.2313,195.0781 Q144.8875,195.0781 144.2,196.1563 Q143.5125,197.2188 143.5125,199.3125 Q143.5125,201.4063 144.2,202.4844 Q144.8875,203.5469 146.2313,203.5469 Q146.8563,203.5469 147.45,203.2813 Q148.0438,203 148.6688,202.4219 L148.6688,205.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="203.6543">Target2</text>
@@ -47,18 +47,18 @@
       <ellipse cx="139" cy="247.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="250.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgl108beyvrp8)" height="99.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ck0gaj3c42z)" height="99.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/>
       <ellipse cx="369.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M372.7188,192.6406 Q372.1406,192.9375 371.5,193.0781 Q370.8594,193.2344 370.1563,193.2344 Q367.6563,193.2344 366.3281,191.5938 Q365.0156,189.9375 365.0156,186.8125 Q365.0156,183.6875 366.3281,182.0313 Q367.6563,180.375 370.1563,180.375 Q370.8594,180.375 371.5,180.5313 Q372.1563,180.6875 372.7188,180.9844 L372.7188,183.7031 Q372.0938,183.125 371.5,182.8594 Q370.9063,182.5781 370.2813,182.5781 Q368.9375,182.5781 368.25,183.6563 Q367.5625,184.7188 367.5625,186.8125 Q367.5625,188.9063 368.25,189.9844 Q368.9375,191.0469 370.2813,191.0469 Q370.9063,191.0469 371.5,190.7813 Q372.0938,190.5 372.7188,189.9219 L372.7188,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="191.1543">Proxy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="203" y2="203"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="209"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="217.2104">m_target : std::shared_ptr&lt;Target&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="223.8047" y2="223.8047"/>
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index dc83dc96..2e0b08d2 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="378px" preserveAspectRatio="none" style="width:538px;height:378px;" version="1.1" viewBox="0 0 538 378" width="538px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f14nc2la0928ij" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flbpd487n28cs" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flbpd487n28cs)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/>
       <ellipse cx="23.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,302.1406 Q26.0906,302.4375 25.45,302.5781 Q24.8094,302.7344 24.1063,302.7344 Q21.6063,302.7344 20.2781,301.0938 Q18.9656,299.4375 18.9656,296.3125 Q18.9656,293.1875 20.2781,291.5313 Q21.6063,289.875 24.1063,289.875 Q24.8094,289.875 25.45,290.0313 Q26.1063,290.1875 26.6688,290.4844 L26.6688,293.2031 Q26.0438,292.625 25.45,292.3594 Q24.8563,292.0781 24.2313,292.0781 Q22.8875,292.0781 22.2,293.1563 Q21.5125,294.2188 21.5125,296.3125 Q21.5125,298.4063 22.2,299.4844 Q22.8875,300.5469 24.2313,300.5469 Q24.8563,300.5469 25.45,300.2813 Q26.0438,300 26.6688,299.4219 L26.6688,302.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="300.6543">Target1</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="344.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="347.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="440" y="280.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flbpd487n28cs)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="440" y="280.5"/>
       <ellipse cx="457.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M460.6688,302.1406 Q460.0906,302.4375 459.45,302.5781 Q458.8094,302.7344 458.1063,302.7344 Q455.6063,302.7344 454.2781,301.0938 Q452.9656,299.4375 452.9656,296.3125 Q452.9656,293.1875 454.2781,291.5313 Q455.6063,289.875 458.1063,289.875 Q458.8094,289.875 459.45,290.0313 Q460.1063,290.1875 460.6688,290.4844 L460.6688,293.2031 Q460.0438,292.625 459.45,292.3594 Q458.8563,292.0781 458.2313,292.0781 Q456.8875,292.0781 456.2,293.1563 Q455.5125,294.2188 455.5125,296.3125 Q455.5125,298.4063 456.2,299.4844 Q456.8875,300.5469 458.2313,300.5469 Q458.8563,300.5469 459.45,300.2813 Q460.0438,300 460.6688,299.4219 L460.6688,302.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="472.3" y="300.6543">Target2</text>
@@ -33,8 +33,8 @@
       <ellipse cx="451" cy="344.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="460" y="347.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="99.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="128.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flbpd487n28cs)" height="99.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="128.5" y="268"/>
       <ellipse cx="240.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M243.2188,289.6406 Q242.6406,289.9375 242,290.0781 Q241.3594,290.2344 240.6563,290.2344 Q238.1563,290.2344 236.8281,288.5938 Q235.5156,286.9375 235.5156,283.8125 Q235.5156,280.6875 236.8281,279.0313 Q238.1563,277.375 240.6563,277.375 Q241.3594,277.375 242,277.5313 Q242.6563,277.6875 243.2188,277.9844 L243.2188,280.7031 Q242.5938,280.125 242,279.8594 Q241.4063,279.5781 240.7813,279.5781 Q239.4375,279.5781 238.75,280.6563 Q238.0625,281.7188 238.0625,283.8125 Q238.0625,285.9063 238.75,286.9844 Q239.4375,288.0469 240.7813,288.0469 Q241.4063,288.0469 242,287.7813 Q242.5938,287.5 243.2188,286.9219 L243.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="260.75" y="288.1543">Proxy</text>
@@ -42,11 +42,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="399.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="403.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134.5" y="306"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136.5" y="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148.5" y="314.2104">m_target : std::shared_ptr&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="403.5" y1="320.8047" y2="320.8047"/>
@@ -56,7 +56,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148.5" y="347.8198">m1() : void</text>
     <ellipse cx="139.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148.5" y="360.6245">m2() : void</text>
-    <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="131.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#flbpd487n28cs)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="131.5" y="159"/>
     <ellipse cx="146.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M149.4688,180.6406 Q148.8906,180.9375 148.25,181.0781 Q147.6094,181.2344 146.9063,181.2344 Q144.4063,181.2344 143.0781,179.5938 Q141.7656,177.9375 141.7656,174.8125 Q141.7656,171.6875 143.0781,170.0313 Q144.4063,168.375 146.9063,168.375 Q147.6094,168.375 148.25,168.5313 Q148.9063,168.6875 149.4688,168.9844 L149.4688,171.7031 Q148.8438,171.125 148.25,170.8594 Q147.6563,170.5781 147.0313,170.5781 Q145.6875,170.5781 145,171.6563 Q144.3125,172.7188 144.3125,174.8125 Q144.3125,176.9063 145,177.9844 Q145.6875,179.0469 147.0313,179.0469 Q147.6563,179.0469 148.25,178.7813 Q148.8438,178.5 149.4688,177.9219 L149.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="160.5" y="179.1543">Proxy</text>
@@ -64,7 +64,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="202.5" y="168.1387">Target1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="248.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="248.5" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="284.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#flbpd487n28cs)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="284.5" y="159"/>
     <ellipse cx="299.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M302.4688,180.6406 Q301.8906,180.9375 301.25,181.0781 Q300.6094,181.2344 299.9063,181.2344 Q297.4063,181.2344 296.0781,179.5938 Q294.7656,177.9375 294.7656,174.8125 Q294.7656,171.6875 296.0781,170.0313 Q297.4063,168.375 299.9063,168.375 Q300.6094,168.375 301.25,168.5313 Q301.9063,168.6875 302.4688,168.9844 L302.4688,171.7031 Q301.8438,171.125 301.25,170.8594 Q300.6563,170.5781 300.0313,170.5781 Q298.6875,170.5781 298,171.6563 Q297.3125,172.7188 297.3125,174.8125 Q297.3125,176.9063 298,177.9844 Q298.6875,179.0469 300.0313,179.0469 Q300.6563,179.0469 301.25,178.7813 Q301.8438,178.5 302.4688,177.9219 L302.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="313.5" y="179.1543">Proxy</text>
@@ -72,25 +72,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="355.5" y="168.1387">Target2</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="401.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="401.5" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f14nc2la0928ij)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="182" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flbpd487n28cs)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="182" y="8"/>
       <ellipse cx="225.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M228.3188,29.6406 Q227.7406,29.9375 227.1,30.0781 Q226.4594,30.2344 225.7563,30.2344 Q223.2563,30.2344 221.9281,28.5938 Q220.6156,26.9375 220.6156,23.8125 Q220.6156,20.6875 221.9281,19.0313 Q223.2563,17.375 225.7563,17.375 Q226.4594,17.375 227.1,17.5313 Q227.7563,17.6875 228.3188,17.9844 L228.3188,20.7031 Q227.6938,20.125 227.1,19.8594 Q226.5063,19.5781 225.8813,19.5781 Q224.5375,19.5781 223.85,20.6563 Q223.1625,21.7188 223.1625,23.8125 Q223.1625,25.9063 223.85,26.9844 Q224.5375,28.0469 225.8813,28.0469 Q226.5063,28.0469 227.1,27.7813 Q227.6938,27.5 228.3188,26.9219 L228.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="245.65" y="28.1543">ProxyHolder</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="350" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="188" y="46"/>
       <ellipse cx="193" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="202" y="54.2104">proxy1 : Proxy&lt;Target1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="188" y="58.8047"/>
       <ellipse cx="193" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="202" y="67.0151">proxy2 : Proxy&lt;Target2&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="350" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index 8c6f2ba8..a76bda37 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="567px" preserveAspectRatio="none" style="width:690px;height:567px;" version="1.1" viewBox="0 0 690 567" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dhefjal8smim" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhmabytqyb8lr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="86.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="165.5" y="470"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhmabytqyb8lr)" height="86.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="165.5" y="470"/>
       <ellipse cx="220.25" cy="486" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.2188,491.6406 Q222.6406,491.9375 222,492.0781 Q221.3594,492.2344 220.6563,492.2344 Q218.1563,492.2344 216.8281,490.5938 Q215.5156,488.9375 215.5156,485.8125 Q215.5156,482.6875 216.8281,481.0313 Q218.1563,479.375 220.6563,479.375 Q221.3594,479.375 222,479.5313 Q222.6563,479.6875 223.2188,479.9844 L223.2188,482.7031 Q222.5938,482.125 222,481.8594 Q221.4063,481.5781 220.7813,481.5781 Q219.4375,481.5781 218.75,482.6563 Q218.0625,483.7188 218.0625,485.8125 Q218.0625,487.9063 218.75,488.9844 Q219.4375,490.0469 220.7813,490.0469 Q221.4063,490.0469 222,489.7813 Q222.5938,489.5 223.2188,488.9219 L223.2188,491.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="240.75" y="490.1543">Memento</text>
@@ -18,11 +18,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="347.5" y="479.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="166.5" x2="351.5" y1="502" y2="502"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="171.5" y="508"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="173.5" y="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="185.5" y="516.2104">m_value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="166.5" x2="351.5" y1="522.8047" y2="522.8047"/>
@@ -30,8 +30,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="185.5" y="537.0151">Memento&lt;T&gt;(T &amp;&amp; v) : void</text>
     <ellipse cx="176.5" cy="546.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="185.5" y="549.8198">value() const : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="124.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhmabytqyb8lr)" height="124.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
       <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
@@ -39,11 +39,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="671.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="314.2104">m_value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
@@ -57,8 +57,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="373.4292">print() const : void</text>
     <ellipse cx="442.5" cy="383.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="386.2339">set(T &amp;&amp; v) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhmabytqyb8lr)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/>
       <ellipse cx="160.25" cy="303.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.2188,309.1406 Q162.6406,309.4375 162,309.5781 Q161.3594,309.7344 160.6563,309.7344 Q158.1563,309.7344 156.8281,308.0938 Q155.5156,306.4375 155.5156,303.3125 Q155.5156,300.1875 156.8281,298.5313 Q158.1563,296.875 160.6563,296.875 Q161.3594,296.875 162,297.0313 Q162.6563,297.1875 163.2188,297.4844 L163.2188,300.2031 Q162.5938,299.625 162,299.3594 Q161.4063,299.0781 160.7813,299.0781 Q159.4375,299.0781 158.75,300.1563 Q158.0625,301.2188 158.0625,303.3125 Q158.0625,305.4063 158.75,306.4844 Q159.4375,307.5469 160.7813,307.5469 Q161.4063,307.5469 162,307.2813 Q162.5938,307 163.2188,306.4219 L163.2188,309.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="307.6543">Caretaker</text>
@@ -66,11 +66,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="296.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="319.5" y2="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="325.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="327.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="333.7104">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="340.3047" y2="340.3047"/>
@@ -78,7 +78,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="354.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
     <ellipse cx="17" cy="364.1094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="367.3198">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
-    <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fhmabytqyb8lr)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
     <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
@@ -86,7 +86,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="339" y="168.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fhmabytqyb8lr)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
     <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
@@ -94,25 +94,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="554" y="168.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1dhefjal8smim)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhmabytqyb8lr)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
       <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="46"/>
       <ellipse cx="313.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="54.2104">caretaker : Caretaker&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="58.8047"/>
       <ellipse cx="313.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="67.0151">originator : Originator&lt;std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index a2e8792b..d4c492fb 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1274px;height:390px;" version="1.1" viewBox="0 0 1274 390" width="1274px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1a42wrhf09rqe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fmwnycuvjbvnl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="73.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="402.5" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="73.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="402.5" y="184"/>
       <ellipse cx="463.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M463.3594,195.3438 L462.2031,200.4219 L464.5313,200.4219 L463.3594,195.3438 Z M461.875,193.1094 L464.8594,193.1094 L468.2188,205.5 L465.7656,205.5 L465,202.4375 L461.7188,202.4375 L460.9688,205.5 L458.5313,205.5 L461.875,193.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="483.75" y="204.1543">Shape</text>
@@ -21,14 +21,14 @@
       <ellipse cx="413.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="144" x="422.5" y="251.0151">~Shape() = default : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="134" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="134" y="197"/>
     <ellipse cx="149" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M151.9688,218.6406 Q151.3906,218.9375 150.75,219.0781 Q150.1094,219.2344 149.4063,219.2344 Q146.9063,219.2344 145.5781,217.5938 Q144.2656,215.9375 144.2656,212.8125 Q144.2656,209.6875 145.5781,208.0313 Q146.9063,206.375 149.4063,206.375 Q150.1094,206.375 150.75,206.5313 Q151.4063,206.6875 151.9688,206.9844 L151.9688,209.7031 Q151.3438,209.125 150.75,208.8594 Q150.1563,208.5781 149.5313,208.5781 Q148.1875,208.5781 147.5,209.6563 Q146.8125,210.7188 146.8125,212.8125 Q146.8125,214.9063 147.5,215.9844 Q148.1875,217.0469 149.5313,217.0469 Q150.1563,217.0469 150.75,216.7813 Q151.3438,216.5 151.9688,215.9219 L151.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="217.1543">Line</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="190" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="190" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="142" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="142" y="319"/>
       <ellipse cx="161.05" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M164.0188,340.6406 Q163.4406,340.9375 162.8,341.0781 Q162.1594,341.2344 161.4563,341.2344 Q158.9563,341.2344 157.6281,339.5938 Q156.3156,337.9375 156.3156,334.8125 Q156.3156,331.6875 157.6281,330.0313 Q158.9563,328.375 161.4563,328.375 Q162.1594,328.375 162.8,328.5313 Q163.4563,328.6875 164.0188,328.9844 L164.0188,331.7031 Q163.3938,331.125 162.8,330.8594 Q162.2063,330.5781 161.5813,330.5781 Q160.2375,330.5781 159.55,331.6563 Q158.8625,332.7188 158.8625,334.8125 Q158.8625,336.9063 159.55,337.9844 Q160.2375,339.0469 161.5813,339.0469 Q162.2063,339.0469 162.8,338.7813 Q163.3938,338.5 164.0188,337.9219 L164.0188,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="175.95" y="339.1543">Line</text>
@@ -39,14 +39,14 @@
       <ellipse cx="153" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="162" y="373.2104">display() : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="913.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="913.5" y="197"/>
     <ellipse cx="928.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M931.4688,218.6406 Q930.8906,218.9375 930.25,219.0781 Q929.6094,219.2344 928.9063,219.2344 Q926.4063,219.2344 925.0781,217.5938 Q923.7656,215.9375 923.7656,212.8125 Q923.7656,209.6875 925.0781,208.0313 Q926.4063,206.375 928.9063,206.375 Q929.6094,206.375 930.25,206.5313 Q930.9063,206.6875 931.4688,206.9844 L931.4688,209.7031 Q930.8438,209.125 930.25,208.8594 Q929.6563,208.5781 929.0313,208.5781 Q927.6875,208.5781 927,209.6563 Q926.3125,210.7188 926.3125,212.8125 Q926.3125,214.9063 927,215.9844 Q927.6875,217.0469 929.0313,217.0469 Q929.6563,217.0469 930.25,216.7813 Q930.8438,216.5 931.4688,215.9219 L931.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="942.5" y="217.1543">Text</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="914.5" x2="970.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="914.5" x2="970.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="696" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="696" y="319"/>
       <ellipse cx="714.6" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M717.5688,340.6406 Q716.9906,340.9375 716.35,341.0781 Q715.7094,341.2344 715.0063,341.2344 Q712.5063,341.2344 711.1781,339.5938 Q709.8656,337.9375 709.8656,334.8125 Q709.8656,331.6875 711.1781,330.0313 Q712.5063,328.375 715.0063,328.375 Q715.7094,328.375 716.35,328.5313 Q717.0063,328.6875 717.5688,328.9844 L717.5688,331.7031 Q716.9438,331.125 716.35,330.8594 Q715.7563,330.5781 715.1313,330.5781 Q713.7875,330.5781 713.1,331.6563 Q712.4125,332.7188 712.4125,334.8125 Q712.4125,336.9063 713.1,337.9844 Q713.7875,339.0469 715.1313,339.0469 Q715.7563,339.0469 716.35,338.7813 Q716.9438,338.5 717.5688,337.9219 L717.5688,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="729.4" y="339.1543">Text</text>
@@ -57,8 +57,8 @@
       <ellipse cx="707" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="716" y="373.2104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1066" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1066" y="27"/>
       <ellipse cx="1081" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1081.1094,38.3438 L1079.9531,43.4219 L1082.2813,43.4219 L1081.1094,38.3438 Z M1079.625,36.1094 L1082.6094,36.1094 L1085.9688,48.5 L1083.5156,48.5 L1082.75,45.4375 L1079.4688,45.4375 L1078.7188,48.5 L1076.2813,48.5 L1079.625,36.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1095" y="47.1543">ShapeDecorator</text>
@@ -67,8 +67,8 @@
       <ellipse cx="1077" cy="78" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1086" y="81.2104">display() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1007" y="190.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1007" y="190.5"/>
       <ellipse cx="1037.3" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1040.2688,212.1406 Q1039.6906,212.4375 1039.05,212.5781 Q1038.4094,212.7344 1037.7063,212.7344 Q1035.2063,212.7344 1033.8781,211.0938 Q1032.5656,209.4375 1032.5656,206.3125 Q1032.5656,203.1875 1033.8781,201.5313 Q1035.2063,199.875 1037.7063,199.875 Q1038.4094,199.875 1039.05,200.0313 Q1039.7063,200.1875 1040.2688,200.4844 L1040.2688,203.2031 Q1039.6438,202.625 1039.05,202.3594 Q1038.4563,202.0781 1037.8313,202.0781 Q1036.4875,202.0781 1035.8,203.1563 Q1035.1125,204.2188 1035.1125,206.3125 Q1035.1125,208.4063 1035.8,209.4844 Q1036.4875,210.5469 1037.8313,210.5469 Q1038.4563,210.5469 1039.05,210.2813 Q1039.6438,210 1040.2688,209.4219 L1040.2688,212.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1054.7" y="210.6543">Color</text>
@@ -79,8 +79,8 @@
       <ellipse cx="1018" cy="241.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1027" y="244.7104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1151" y="190.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1151" y="190.5"/>
       <ellipse cx="1176.35" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1179.3188,212.1406 Q1178.7406,212.4375 1178.1,212.5781 Q1177.4594,212.7344 1176.7563,212.7344 Q1174.2563,212.7344 1172.9281,211.0938 Q1171.6156,209.4375 1171.6156,206.3125 Q1171.6156,203.1875 1172.9281,201.5313 Q1174.2563,199.875 1176.7563,199.875 Q1177.4594,199.875 1178.1,200.0313 Q1178.7563,200.1875 1179.3188,200.4844 L1179.3188,203.2031 Q1178.6938,202.625 1178.1,202.3594 Q1177.5063,202.0781 1176.8813,202.0781 Q1175.5375,202.0781 1174.85,203.1563 Q1174.1625,204.2188 1174.1625,206.3125 Q1174.1625,208.4063 1174.85,209.4844 Q1175.5375,210.5469 1176.8813,210.5469 Q1177.5063,210.5469 1178.1,210.2813 Q1178.6938,210 1179.3188,209.4219 L1179.3188,212.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1192.65" y="210.6543">Weight</text>
@@ -91,7 +91,7 @@
       <ellipse cx="1162" cy="241.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1171" y="244.7104">display() : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="226" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="226" y="197"/>
     <ellipse cx="241" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M243.9688,218.6406 Q243.3906,218.9375 242.75,219.0781 Q242.1094,219.2344 241.4063,219.2344 Q238.9063,219.2344 237.5781,217.5938 Q236.2656,215.9375 236.2656,212.8125 Q236.2656,209.6875 237.5781,208.0313 Q238.9063,206.375 241.4063,206.375 Q242.1094,206.375 242.75,206.5313 Q243.4063,206.6875 243.9688,206.9844 L243.9688,209.7031 Q243.3438,209.125 242.75,208.8594 Q242.1563,208.5781 241.5313,208.5781 Q240.1875,208.5781 239.5,209.6563 Q238.8125,210.7188 238.8125,212.8125 Q238.8125,214.9063 239.5,215.9844 Q240.1875,217.0469 241.5313,217.0469 Q242.1563,217.0469 242.75,216.7813 Q243.3438,216.5 243.9688,215.9219 L243.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="255" y="217.1543">Line</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="289" y="206.1387">Color,Weight</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="227" x2="366" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="227" x2="366" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="197"/>
     <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="217.1543">Line</text>
@@ -107,7 +107,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="206.1387">Color</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="607.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="607.5" y="197"/>
     <ellipse cx="622.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M625.4688,218.6406 Q624.8906,218.9375 624.25,219.0781 Q623.6094,219.2344 622.9063,219.2344 Q620.4063,219.2344 619.0781,217.5938 Q617.7656,215.9375 617.7656,212.8125 Q617.7656,209.6875 619.0781,208.0313 Q620.4063,206.375 622.9063,206.375 Q623.6094,206.375 624.25,206.5313 Q624.9063,206.6875 625.4688,206.9844 L625.4688,209.7031 Q624.8438,209.125 624.25,208.8594 Q623.6563,208.5781 623.0313,208.5781 Q621.6875,208.5781 621,209.6563 Q620.3125,210.7188 620.3125,212.8125 Q620.3125,214.9063 621,215.9844 Q621.6875,217.0469 623.0313,217.0469 Q623.6563,217.0469 624.25,216.7813 Q624.8438,216.5 625.4688,215.9219 L625.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="636.5" y="217.1543">Text</text>
@@ -115,7 +115,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="671.5" y="206.1387">Color,Weight</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="608.5" x2="748.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="608.5" x2="748.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="784.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="784.5" y="197"/>
     <ellipse cx="799.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M802.4688,218.6406 Q801.8906,218.9375 801.25,219.0781 Q800.6094,219.2344 799.9063,219.2344 Q797.4063,219.2344 796.0781,217.5938 Q794.7656,215.9375 794.7656,212.8125 Q794.7656,209.6875 796.0781,208.0313 Q797.4063,206.375 799.9063,206.375 Q800.6094,206.375 801.25,206.5313 Q801.9063,206.6875 802.4688,206.9844 L802.4688,209.7031 Q801.8438,209.125 801.25,208.8594 Q800.6563,208.5781 800.0313,208.5781 Q798.6875,208.5781 798,209.6563 Q797.3125,210.7188 797.3125,212.8125 Q797.3125,214.9063 798,215.9844 Q798.6875,217.0469 800.0313,217.0469 Q800.6563,217.0469 801.25,216.7813 Q801.8438,216.5 802.4688,215.9219 L802.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="813.5" y="217.1543">Text</text>
@@ -123,39 +123,39 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="848.5" y="206.1387">Color</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="785.5" x2="877.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="785.5" x2="877.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a42wrhf09rqe)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="428.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmwnycuvjbvnl)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="428.5" y="8"/>
       <ellipse cx="494.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M497.7188,29.6406 Q497.1406,29.9375 496.5,30.0781 Q495.8594,30.2344 495.1563,30.2344 Q492.6563,30.2344 491.3281,28.5938 Q490.0156,26.9375 490.0156,23.8125 Q490.0156,20.6875 491.3281,19.0313 Q492.6563,17.375 495.1563,17.375 Q495.8594,17.375 496.5,17.5313 Q497.1563,17.6875 497.7188,17.9844 L497.7188,20.7031 Q497.0938,20.125 496.5,19.8594 Q495.9063,19.5781 495.2813,19.5781 Q493.9375,19.5781 493.25,20.6563 Q492.5625,21.7188 492.5625,23.8125 Q492.5625,25.9063 493.25,26.9844 Q493.9375,28.0469 495.2813,28.0469 Q495.9063,28.0469 496.5,27.7813 Q497.0938,27.5 497.7188,26.9219 L497.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="515.25" y="28.1543">Window</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="429.5" x2="615.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="46"/>
       <ellipse cx="439.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="448.5" y="54.2104">border : Line&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="58.8047"/>
       <ellipse cx="439.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="448.5" y="67.0151">divider : Line&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="71.6094"/>
       <ellipse cx="439.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="448.5" y="79.8198">title : Text&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="84.4141"/>
       <ellipse cx="439.5" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="448.5" y="92.6245">description : Text&lt;Color&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="429.5" x2="615.5" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index cd71efac..f154b0d2 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="410px" preserveAspectRatio="none" style="width:877px;height:410px;" version="1.1" viewBox="0 0 877 410" width="877px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1mwm3qmwhfxb3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13rs5vr3axwpg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,54 +9,54 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="95" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="95" y="226.5"/>
       <ellipse cx="110" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,248.1406 Q112.3906,248.4375 111.75,248.5781 Q111.1094,248.7344 110.4063,248.7344 Q107.9063,248.7344 106.5781,247.0938 Q105.2656,245.4375 105.2656,242.3125 Q105.2656,239.1875 106.5781,237.5313 Q107.9063,235.875 110.4063,235.875 Q111.1094,235.875 111.75,236.0313 Q112.4063,236.1875 112.9688,236.4844 L112.9688,239.2031 Q112.3438,238.625 111.75,238.3594 Q111.1563,238.0781 110.5313,238.0781 Q109.1875,238.0781 108.5,239.1563 Q107.8125,240.2188 107.8125,242.3125 Q107.8125,244.4063 108.5,245.4844 Q109.1875,246.5469 110.5313,246.5469 Q111.1563,246.5469 111.75,246.2813 Q112.3438,246 112.9688,245.4219 L112.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="124" y="246.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="134" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="134" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M12.5,64.5 L12.5,89.6328 L115.5,89.6328 L115.5,74.5 L105.5,64.5 L12.5,64.5 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M12.5,64.5 L12.5,89.6328 L115.5,89.6328 L115.5,74.5 L105.5,64.5 L12.5,64.5 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105.5,64.5 L105.5,74.5 L115.5,74.5 L105.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="18.5" y="81.5669">A class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="684" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="684" y="226.5"/>
       <ellipse cx="699" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M701.9688,248.1406 Q701.3906,248.4375 700.75,248.5781 Q700.1094,248.7344 699.4063,248.7344 Q696.9063,248.7344 695.5781,247.0938 Q694.2656,245.4375 694.2656,242.3125 Q694.2656,239.1875 695.5781,237.5313 Q696.9063,235.875 699.4063,235.875 Q700.1094,235.875 700.75,236.0313 Q701.4063,236.1875 701.9688,236.4844 L701.9688,239.2031 Q701.3438,238.625 700.75,238.3594 Q700.1563,238.0781 699.5313,238.0781 Q698.1875,238.0781 697.5,239.1563 Q696.8125,240.2188 696.8125,242.3125 Q696.8125,244.4063 697.5,245.4844 Q698.1875,246.5469 699.5313,246.5469 Q700.1563,246.5469 700.75,246.2813 Q701.3438,246 701.9688,245.4219 L701.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="713" y="246.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="685" x2="723" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="685" x2="723" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M545.5,238 L545.5,263.1328 A0,0 0 0 0 545.5,263.1328 L648.5,263.1328 A0,0 0 0 0 648.5,263.1328 L648.5,256 L683.74,250.5 L648.5,248 L648.5,248 L638.5,238 L545.5,238 A0,0 0 0 0 545.5,238 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M545.5,238 L545.5,263.1328 A0,0 0 0 0 545.5,263.1328 L648.5,263.1328 A0,0 0 0 0 648.5,263.1328 L648.5,256 L683.74,250.5 L648.5,248 L648.5,248 L638.5,238 L545.5,238 A0,0 0 0 0 545.5,238 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M638.5,238 L638.5,248 L648.5,248 L638.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="551.5" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="247" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="247" y="226.5"/>
       <ellipse cx="262" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M264.9688,248.1406 Q264.3906,248.4375 263.75,248.5781 Q263.1094,248.7344 262.4063,248.7344 Q259.9063,248.7344 258.5781,247.0938 Q257.2656,245.4375 257.2656,242.3125 Q257.2656,239.1875 258.5781,237.5313 Q259.9063,235.875 262.4063,235.875 Q263.1094,235.875 263.75,236.0313 Q264.4063,236.1875 264.9688,236.4844 L264.9688,239.2031 Q264.3438,238.625 263.75,238.3594 Q263.1563,238.0781 262.5313,238.0781 Q261.1875,238.0781 260.5,239.1563 Q259.8125,240.2188 259.8125,242.3125 Q259.8125,244.4063 260.5,245.4844 Q261.1875,246.5469 262.5313,246.5469 Q263.1563,246.5469 263.75,246.2813 Q264.3438,246 264.9688,245.4219 L264.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="276" y="246.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="248" x2="286" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="248" x2="286" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M158.5,357 L158.5,382.1328 A0,0 0 0 0 158.5,382.1328 L261.5,382.1328 A0,0 0 0 0 261.5,382.1328 L261.5,367 L251.5,357 L219.68,357 L255.74,274.62 L211.68,357 L158.5,357 A0,0 0 0 0 158.5,357 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M158.5,357 L158.5,382.1328 A0,0 0 0 0 158.5,382.1328 L261.5,382.1328 A0,0 0 0 0 261.5,382.1328 L261.5,367 L251.5,357 L219.68,357 L255.74,274.62 L211.68,357 L158.5,357 A0,0 0 0 0 158.5,357 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M251.5,357 L251.5,367 L261.5,367 L251.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164.5" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L25" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="170.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L25" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="170.5" y="226.5"/>
       <ellipse cx="185.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.4688,248.1406 Q187.8906,248.4375 187.25,248.5781 Q186.6094,248.7344 185.9063,248.7344 Q183.4063,248.7344 182.0781,247.0938 Q180.7656,245.4375 180.7656,242.3125 Q180.7656,239.1875 182.0781,237.5313 Q183.4063,235.875 185.9063,235.875 Q186.6094,235.875 187.25,236.0313 Q187.9063,236.1875 188.4688,236.4844 L188.4688,239.2031 Q187.8438,238.625 187.25,238.3594 Q186.6563,238.0781 186.0313,238.0781 Q184.6875,238.0781 184,239.1563 Q183.3125,240.2188 183.3125,242.3125 Q183.3125,244.4063 184,245.4844 Q184.6875,246.5469 186.0313,246.5469 Q186.6563,246.5469 187.25,246.2813 Q187.8438,246 188.4688,245.4219 L188.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.5" y="246.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171.5" x2="210.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="171.5" x2="210.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M6,223 L6,278.3984 L60,278.3984 L60,233 L50,223 L6,223 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,223 L6,278.3984 L60,278.3984 L60,233 L50,223 L6,223 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M50,223 L50,233 L60,233 L50,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="12" y="240.0669">D</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="12" y="255.1997">class</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="12" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="496" y="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="496" y="339"/>
       <ellipse cx="524.95" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M527.9188,360.6406 Q527.3406,360.9375 526.7,361.0781 Q526.0594,361.2344 525.3563,361.2344 Q522.8563,361.2344 521.5281,359.5938 Q520.2156,357.9375 520.2156,354.8125 Q520.2156,351.6875 521.5281,350.0313 Q522.8563,348.375 525.3563,348.375 Q526.0594,348.375 526.7,348.5313 Q527.3563,348.6875 527.9188,348.9844 L527.9188,351.7031 Q527.2938,351.125 526.7,350.8594 Q526.1063,350.5781 525.4813,350.5781 Q524.1375,350.5781 523.45,351.6563 Q522.7625,352.7188 522.7625,354.8125 Q522.7625,356.9063 523.45,357.9844 Q524.1375,359.0469 525.4813,359.0469 Q526.1063,359.0469 526.7,358.7813 Q527.2938,358.5 527.9188,357.9219 L527.9188,360.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="542.05" y="359.1543">E</text>
@@ -64,27 +64,27 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="573" y="348.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="577" y1="371" y2="371"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="502" y="377"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="504" y="379"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L30" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="516" y="385.2104">param : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="497" x2="577" y1="391.8047" y2="391.8047"/>
-    <path d="M297,357 L297,382.1328 A0,0 0 0 0 297,382.1328 L461,382.1328 A0,0 0 0 0 461,382.1328 L461,375 L495.78,369.5 L461,367 L461,367 L451,357 L297,357 A0,0 0 0 0 297,357 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M297,357 L297,382.1328 A0,0 0 0 0 297,382.1328 L461,382.1328 A0,0 0 0 0 461,382.1328 L461,375 L495.78,369.5 L461,367 L461,367 L451,357 L297,357 A0,0 0 0 0 297,357 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M451,357 L451,367 L461,367 L451,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="303" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="373.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="373.5" y="226.5"/>
       <ellipse cx="388.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.4688,248.1406 Q390.8906,248.4375 390.25,248.5781 Q389.6094,248.7344 388.9063,248.7344 Q386.4063,248.7344 385.0781,247.0938 Q383.7656,245.4375 383.7656,242.3125 Q383.7656,239.1875 385.0781,237.5313 Q386.4063,235.875 388.9063,235.875 Q389.6094,235.875 390.25,236.0313 Q390.9063,236.1875 391.4688,236.4844 L391.4688,239.2031 Q390.8438,238.625 390.25,238.3594 Q389.6563,238.0781 389.0313,238.0781 Q387.6875,238.0781 387,239.1563 Q386.3125,240.2188 386.3125,242.3125 Q386.3125,244.4063 387,245.4844 Q387.6875,246.5469 389.0313,246.5469 Q389.6563,246.5469 390.25,246.2813 Q390.8438,246 391.4688,245.4219 L391.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="402.5" y="246.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="413.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="374.5" x2="413.5" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L38" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L38" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="791" y="34"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L38" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L38" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="791" y="34"/>
       <ellipse cx="807.35" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M811.4594,56 L803.7406,56 L803.7406,43.6094 L811.4594,43.6094 L811.4594,45.7656 L806.1938,45.7656 L806.1938,48.4375 L810.9594,48.4375 L810.9594,50.5938 L806.1938,50.5938 L806.1938,53.8438 L811.4594,53.8438 L811.4594,56 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="821.65" y="54.1543">F</text>
@@ -94,10 +94,10 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="797" y="105.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="792" x2="832" y1="112.4141" y2="112.4141"/>
     </a>
-    <path d="M759,238 L759,263.1328 A0,0 0 0 0 759,263.1328 L865,263.1328 A0,0 0 0 0 865,263.1328 L865,248 L855,238 L816,238 L812,120.39 L808,238 L759,238 A0,0 0 0 0 759,238 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M759,238 L759,263.1328 A0,0 0 0 0 759,263.1328 L865,263.1328 A0,0 0 0 0 865,263.1328 L865,248 L855,238 L816,238 L812,120.39 L808,238 L759,238 A0,0 0 0 0 759,238 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M855,238 L855,248 L865,248 L855,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="765" y="255.0669">F enum note.</text>
-    <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="450" y="226.5"/>
+    <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="450" y="226.5"/>
     <ellipse cx="465" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M467.9688,248.1406 Q467.3906,248.4375 466.75,248.5781 Q466.1094,248.7344 465.4063,248.7344 Q462.9063,248.7344 461.5781,247.0938 Q460.2656,245.4375 460.2656,242.3125 Q460.2656,239.1875 461.5781,237.5313 Q462.9063,235.875 465.4063,235.875 Q466.1094,235.875 466.75,236.0313 Q467.4063,236.1875 467.9688,236.4844 L467.9688,239.2031 Q467.3438,238.625 466.75,238.3594 Q466.1563,238.0781 465.5313,238.0781 Q464.1875,238.0781 463.5,239.1563 Q462.8125,240.2188 462.8125,242.3125 Q462.8125,244.4063 463.5,245.4844 Q464.1875,246.5469 465.5313,246.5469 Q466.1563,246.5469 466.75,246.2813 Q467.3438,246 467.9688,245.4219 L467.9688,248.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="479" y="246.6543">E</text>
@@ -105,59 +105,59 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="496" y="235.6387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="509" y1="258.5" y2="258.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="451" x2="509" y1="266.5" y2="266.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L41" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L41" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1mwm3qmwhfxb3)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="193" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L41" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L41" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13rs5vr3axwpg)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="193" y="8"/>
       <ellipse cx="310.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.7188,29.6406 Q313.1406,29.9375 312.5,30.0781 Q311.8594,30.2344 311.1563,30.2344 Q308.6563,30.2344 307.3281,28.5938 Q306.0156,26.9375 306.0156,23.8125 Q306.0156,20.6875 307.3281,19.0313 Q308.6563,17.375 311.1563,17.375 Q311.8594,17.375 312.5,17.5313 Q313.1563,17.6875 313.7188,17.9844 L313.7188,20.7031 Q313.0938,20.125 312.5,19.8594 Q311.9063,19.5781 311.2813,19.5781 Q309.9375,19.5781 309.25,20.6563 Q308.5625,21.7188 308.5625,23.8125 Q308.5625,25.9063 309.25,26.9844 Q309.9375,28.0469 311.2813,28.0469 Q311.9063,28.0469 312.5,27.7813 Q313.0938,27.5 313.7188,26.9219 L313.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="331.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="194" x2="444" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L47" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L47" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="213" y="54.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L49" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L49" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="213" y="67.0151">bbb : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L51" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L51" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="213" y="79.8198">ccc : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L53" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L53" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="213" y="92.6245">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="97.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="99.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L55" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L55" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="213" y="105.4292">eee : E&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="199" y="110.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="112.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L57" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00028/t00028.cc#L57" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="213" y="118.2339">ggg : G **</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="194" x2="444" y1="124.8281" y2="124.8281"/>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="201" y="132.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="213" y="139.0386">R(C &amp; c) : void</text>
-    <path d="M480,64.5 L480,73 L445.29,77 L480,81 L480,89.6328 A0,0 0 0 0 480,89.6328 L582,89.6328 A0,0 0 0 0 582,89.6328 L582,74.5 L572,64.5 L480,64.5 A0,0 0 0 0 480,64.5 " fill="#FBFB77" filter="url(#f1mwm3qmwhfxb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M480,64.5 L480,73 L445.29,77 L480,81 L480,89.6328 A0,0 0 0 0 480,89.6328 L582,89.6328 A0,0 0 0 0 582,89.6328 L582,74.5 L572,64.5 L480,64.5 A0,0 0 0 0 480,64.5 " fill="#FBFB77" filter="url(#f13rs5vr3axwpg)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M572,64.5 L572,74.5 L582,74.5 L572,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="486" y="81.5669">R class note.</text>
     <path d="M65.13,89.71 C67.4,110.82 73.43,156.48 86,193 C89.91,204.36 95.75,216.29 101.17,226.25 " fill="none" id="GMN450-C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index 3b9e52bf..babc1db6 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:464px;height:230px;" version="1.1" viewBox="0 0 464 230" width="464px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcsva8pdvrux9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19do4pi7o5vcv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
       <ellipse cx="25.5" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.4688,48.6406 Q27.8906,48.9375 27.25,49.0781 Q26.6094,49.2344 25.9063,49.2344 Q23.4063,49.2344 22.0781,47.5938 Q20.7656,45.9375 20.7656,42.8125 Q20.7656,39.6875 22.0781,38.0313 Q23.4063,36.375 25.9063,36.375 Q26.6094,36.375 27.25,36.5313 Q27.9063,36.6875 28.4688,36.9844 L28.4688,39.7031 Q27.8438,39.125 27.25,38.8594 Q26.6563,38.5781 26.0313,38.5781 Q24.6875,38.5781 24,39.6563 Q23.3125,40.7188 23.3125,42.8125 Q23.3125,44.9063 24,45.9844 Q24.6875,47.0469 26.0313,47.0469 Q26.6563,47.0469 27.25,46.7813 Q27.8438,46.5 28.4688,45.9219 L28.4688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.5" y="47.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
       <ellipse cx="114.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.4188,42.1406 Q116.8406,42.4375 116.2,42.5781 Q115.5594,42.7344 114.8563,42.7344 Q112.3563,42.7344 111.0281,41.0938 Q109.7156,39.4375 109.7156,36.3125 Q109.7156,33.1875 111.0281,31.5313 Q112.3563,29.875 114.8563,29.875 Q115.5594,29.875 116.2,30.0313 Q116.8563,30.1875 117.4188,30.4844 L117.4188,33.2031 Q116.7938,32.625 116.2,32.3594 Q115.6063,32.0781 114.9813,32.0781 Q113.6375,32.0781 112.95,33.1563 Q112.2625,34.2188 112.2625,36.3125 Q112.2625,38.4063 112.95,39.4844 Q113.6375,40.5469 114.9813,40.5469 Q115.6063,40.5469 116.2,40.2813 Q116.7938,40 117.4188,39.4219 L117.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.55" y="40.6543">C</text>
@@ -26,16 +26,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="162.5" y="29.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="52.5" y2="52.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="91.5" y="58.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="93.5" y="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L15" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L15" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="105.5" y="66.7104">param : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="73.3047" y2="73.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
       <ellipse cx="218.4" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.5094,30 L214.7906,30 L214.7906,17.6094 L222.5094,17.6094 L222.5094,19.7656 L217.2438,19.7656 L217.2438,22.4375 L222.0094,22.4375 L222.0094,24.5938 L217.2438,24.5938 L217.2438,27.8438 L222.5094,27.8438 L222.5094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="232.6" y="28.1543">E</text>
@@ -45,64 +45,64 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="208.5" y="79.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="243.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L28" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L28" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
       <ellipse cx="315" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M317.9688,192.6406 Q317.3906,192.9375 316.75,193.0781 Q316.1094,193.2344 315.4063,193.2344 Q312.9063,193.2344 311.5781,191.5938 Q310.2656,189.9375 310.2656,186.8125 Q310.2656,183.6875 311.5781,182.0313 Q312.9063,180.375 315.4063,180.375 Q316.1094,180.375 316.75,180.5313 Q317.4063,180.6875 317.9688,180.9844 L317.9688,183.7031 Q317.3438,183.125 316.75,182.8594 Q316.1563,182.5781 315.5313,182.5781 Q314.1875,182.5781 313.5,183.6563 Q312.8125,184.7188 312.8125,186.8125 Q312.8125,188.9063 313.5,189.9844 Q314.1875,191.0469 315.5313,191.0469 Q316.1563,191.0469 316.75,190.7813 Q317.3438,190.5 317.9688,189.9219 L317.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="329" y="191.1543">G1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L31" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L31" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L31" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L31" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="191.1543">G2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L34" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L34" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
       <ellipse cx="105" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,192.6406 Q107.3906,192.9375 106.75,193.0781 Q106.1094,193.2344 105.4063,193.2344 Q102.9063,193.2344 101.5781,191.5938 Q100.2656,189.9375 100.2656,186.8125 Q100.2656,183.6875 101.5781,182.0313 Q102.9063,180.375 105.4063,180.375 Q106.1094,180.375 106.75,180.5313 Q107.4063,180.6875 107.9688,180.9844 L107.9688,183.7031 Q107.3438,183.125 106.75,182.8594 Q106.1563,182.5781 105.5313,182.5781 Q104.1875,182.5781 103.5,183.6563 Q102.8125,184.7188 102.8125,186.8125 Q102.8125,188.9063 103.5,189.9844 Q104.1875,191.0469 105.5313,191.0469 Q106.1563,191.0469 106.75,190.7813 Q107.3438,190.5 107.9688,189.9219 L107.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="119" y="191.1543">G3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L37" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L37" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L37" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L37" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
       <ellipse cx="399" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.9688,192.6406 Q401.3906,192.9375 400.75,193.0781 Q400.1094,193.2344 399.4063,193.2344 Q396.9063,193.2344 395.5781,191.5938 Q394.2656,189.9375 394.2656,186.8125 Q394.2656,183.6875 395.5781,182.0313 Q396.9063,180.375 399.4063,180.375 Q400.1094,180.375 400.75,180.5313 Q401.4063,180.6875 401.9688,180.9844 L401.9688,183.7031 Q401.3438,183.125 400.75,182.8594 Q400.1563,182.5781 399.5313,182.5781 Q398.1875,182.5781 397.5,183.6563 Q396.8125,184.7188 396.8125,186.8125 Q396.8125,188.9063 397.5,189.9844 Q398.1875,191.0469 399.5313,191.0469 Q400.1563,191.0469 400.75,190.7813 Q401.3438,190.5 401.9688,189.9219 L401.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="413" y="191.1543">G4</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L40" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L40" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcsva8pdvrux9)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L40" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L40" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19do4pi7o5vcv)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
       <ellipse cx="358.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.2188,29.6406 Q360.6406,29.9375 360,30.0781 Q359.3594,30.2344 358.6563,30.2344 Q356.1563,30.2344 354.8281,28.5938 Q353.5156,26.9375 353.5156,23.8125 Q353.5156,20.6875 354.8281,19.0313 Q356.1563,17.375 358.6563,17.375 Q359.3594,17.375 360,17.5313 Q360.6563,17.6875 361.2188,17.9844 L361.2188,20.7031 Q360.5938,20.125 360,19.8594 Q359.4063,19.5781 358.7813,19.5781 Q357.4375,19.5781 356.75,20.6563 Q356.0625,21.7188 356.0625,23.8125 Q356.0625,25.9063 356.75,26.9844 Q357.4375,28.0469 358.7813,28.0469 Q359.4063,28.0469 360,27.7813 Q360.5938,27.5 361.2188,26.9219 L361.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="378.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="46"/>
       <ellipse cx="290.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L41" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="299.5" y="54.2104">g1 : G1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="58.8047"/>
       <ellipse cx="290.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L47" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L47" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="299.5" y="67.0151">g3 : G3 &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="71.6094"/>
       <ellipse cx="290.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L49" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00029/t00029.cc#L49" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="299.5" y="79.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index 21b0b058..2d56d837 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ftufszwvvs59o" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1al4feknx30kn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,86 +9,86 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1al4feknx30kn)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1al4feknx30kn)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
       <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1al4feknx30kn)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
       <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L16" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L16" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1al4feknx30kn)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
       <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L19" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1al4feknx30kn)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
       <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftufszwvvs59o)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1al4feknx30kn)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
       <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="46"/>
       <ellipse cx="120" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="54.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="58.8047"/>
       <ellipse cx="120" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L27" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L27" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="67.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="71.6094"/>
       <ellipse cx="120" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L30" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L30" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="79.8198">ccc : std::vector&lt;C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="84.4141"/>
       <ellipse cx="120" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L33" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L33" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="92.6245">ddd : D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="97.2188"/>
       <ellipse cx="120" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L36" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00030/t00030.cc#L36" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="105.4292">eee : E *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="112.0234" y2="112.0234"/>
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 01af0758..deff87fc 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,33 +1,33 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:312px;height:402px;" version="1.1" viewBox="0 0 312 402" width="312px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="g1h3rozg0diiiu0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="g128q4j19fjmi40" x1="0%" x2="100%" y1="50%" y2="50%">
       <stop offset="0%" stop-color="#90EE90"/>
       <stop offset="100%" stop-color="#FFFF00"/>
     </linearGradient>
-    <filter height="300%" id="f1h3rozg0diiiu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f128q4j19fjmi4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
       <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
     </filter>
-    <linearGradient id="g1h3rozg0diiiu1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="g128q4j19fjmi41" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#g1h3rozg0diiiu0)" filter="url(#f1h3rozg0diiiu)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
-      <rect fill="url(#g1h3rozg0diiiu1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#g128q4j19fjmi40)" filter="url(#f128q4j19fjmi4)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
+      <rect fill="url(#g128q4j19fjmi41)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
       <ellipse cx="21" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,224.6406 Q23.3906,224.9375 22.75,225.0781 Q22.1094,225.2344 21.4063,225.2344 Q18.9063,225.2344 17.5781,223.5938 Q16.2656,221.9375 16.2656,218.8125 Q16.2656,215.6875 17.5781,214.0313 Q18.9063,212.375 21.4063,212.375 Q22.1094,212.375 22.75,212.5313 Q23.4063,212.6875 23.9688,212.9844 L23.9688,215.7031 Q23.3438,215.125 22.75,214.8594 Q22.1563,214.5781 21.5313,214.5781 Q20.1875,214.5781 19.5,215.6563 Q18.8125,216.7188 18.8125,218.8125 Q18.8125,220.9063 19.5,221.9844 Q20.1875,223.0469 21.5313,223.0469 Q22.1563,223.0469 22.75,222.7813 Q23.3438,222.5 23.9688,221.9219 L23.9688,224.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="223.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="235" y2="235"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="243" y2="243"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f128q4j19fjmi4)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/>
       <ellipse cx="98.9" cy="200" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M103.0094,206 L95.2906,206 L95.2906,193.6094 L103.0094,193.6094 L103.0094,195.7656 L97.7438,195.7656 L97.7438,198.4375 L102.5094,198.4375 L102.5094,200.5938 L97.7438,200.5938 L97.7438,203.8438 L103.0094,203.8438 L103.0094,206 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.1" y="204.1543">B</text>
@@ -37,8 +37,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="89" y="255.8198">three</text>
       <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="262.4141" y2="262.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#f1h3rozg0diiiu)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#f128q4j19fjmi4)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
       <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
       <ellipse cx="257.2" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
       <path d="M260.1688,352.6406 Q259.5906,352.9375 258.95,353.0781 Q258.3094,353.2344 257.6063,353.2344 Q255.1063,353.2344 253.7781,351.5938 Q252.4656,349.9375 252.4656,346.8125 Q252.4656,343.6875 253.7781,342.0313 Q255.1063,340.375 257.6063,340.375 Q258.3094,340.375 258.95,340.5313 Q259.6063,340.6875 260.1688,340.9844 L260.1688,343.7031 Q259.5438,343.125 258.95,342.8594 Q258.3563,342.5781 257.7313,342.5781 Q256.3875,342.5781 255.7,343.6563 Q255.0125,344.7188 255.0125,346.8125 Q255.0125,348.9063 255.7,349.9844 Q256.3875,351.0469 257.7313,351.0469 Q258.3563,351.0469 258.95,350.7813 Q259.5438,350.5 260.1688,349.9219 L260.1688,352.6406 Z "/>
@@ -47,23 +47,23 @@
       <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="291.5" y="340.1387">T</text>
       <line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="363" y2="363"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="245.5" y="369"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="247.5" y="371"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L16" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L16" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="259.5" y="377.2104">ttt : T</text>
     </a>
     <line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="383.8047" y2="383.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f128q4j19fjmi4)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/>
       <ellipse cx="176.5" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M179.4688,224.6406 Q178.8906,224.9375 178.25,225.0781 Q177.6094,225.2344 176.9063,225.2344 Q174.4063,225.2344 173.0781,223.5938 Q171.7656,221.9375 171.7656,218.8125 Q171.7656,215.6875 173.0781,214.0313 Q174.4063,212.375 176.9063,212.375 Q177.6094,212.375 178.25,212.5313 Q178.9063,212.6875 179.4688,212.9844 L179.4688,215.7031 Q178.8438,215.125 178.25,214.8594 Q177.6563,214.5781 177.0313,214.5781 Q175.6875,214.5781 175,215.6563 Q174.3125,216.7188 174.3125,218.8125 Q174.3125,220.9063 175,221.9844 Q175.6875,223.0469 177.0313,223.0469 Q177.6563,223.0469 178.25,222.7813 Q178.8438,222.5 179.4688,221.9219 L179.4688,224.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="190.5" y="223.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="235" y2="235"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="243" y2="243"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/>
+    <rect fill="#FEFECE" filter="url(#f128q4j19fjmi4)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/>
     <ellipse cx="253" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M255.9688,224.6406 Q255.3906,224.9375 254.75,225.0781 Q254.1094,225.2344 253.4063,225.2344 Q250.9063,225.2344 249.5781,223.5938 Q248.2656,221.9375 248.2656,218.8125 Q248.2656,215.6875 249.5781,214.0313 Q250.9063,212.375 253.4063,212.375 Q254.1094,212.375 254.75,212.5313 Q255.4063,212.6875 255.9688,212.9844 L255.9688,215.7031 Q255.3438,215.125 254.75,214.8594 Q254.1563,214.5781 253.5313,214.5781 Q252.1875,214.5781 251.5,215.6563 Q250.8125,216.7188 250.8125,218.8125 Q250.8125,220.9063 251.5,221.9844 Q252.1875,223.0469 253.5313,223.0469 Q254.1563,223.0469 254.75,222.7813 Q255.3438,222.5 255.9688,221.9219 L255.9688,224.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="267" y="223.1543">C</text>
@@ -71,39 +71,39 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="284" y="212.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="235" y2="235"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="243" y2="243"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1h3rozg0diiiu)" height="99.2188" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L22" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f128q4j19fjmi4)" height="99.2188" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/>
       <ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="46"/>
       <ellipse cx="81" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L24" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L24" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="90" y="54.2104">aaa : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="58.8047"/>
       <ellipse cx="81" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L28" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L28" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="71.6094"/>
       <ellipse cx="81" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L31" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L31" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="90" y="79.8198">ccc : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="84.4141"/>
       <ellipse cx="81" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L34" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00031/t00031.cc#L34" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="90" y="92.6245">ddd : D *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 275f148e..f49027e5 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:743px;height:326px;" version="1.1" viewBox="0 0 743 326" width="743px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fsc6o2d3ps4h5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jmlh8qxpl814" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,24 +9,24 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/>
       <ellipse cx="58.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M61.4688,167.6406 Q60.8906,167.9375 60.25,168.0781 Q59.6094,168.2344 58.9063,168.2344 Q56.4063,168.2344 55.0781,166.5938 Q53.7656,164.9375 53.7656,161.8125 Q53.7656,158.6875 55.0781,157.0313 Q56.4063,155.375 58.9063,155.375 Q59.6094,155.375 60.25,155.5313 Q60.9063,155.6875 61.4688,155.9844 L61.4688,158.7031 Q60.8438,158.125 60.25,157.8594 Q59.6563,157.5781 59.0313,157.5781 Q57.6875,157.5781 57,158.6563 Q56.3125,159.7188 56.3125,161.8125 Q56.3125,163.9063 57,164.9844 Q57.6875,166.0469 59.0313,166.0469 Q59.6563,166.0469 60.25,165.7813 Q60.8438,165.5 61.4688,164.9219 L61.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="72.5" y="166.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L10" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L10" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L10" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L10" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/>
       <ellipse cx="194" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,283.1406 Q196.3906,283.4375 195.75,283.5781 Q195.1094,283.7344 194.4063,283.7344 Q191.9063,283.7344 190.5781,282.0938 Q189.2656,280.4375 189.2656,277.3125 Q189.2656,274.1875 190.5781,272.5313 Q191.9063,270.875 194.4063,270.875 Q195.1094,270.875 195.75,271.0313 Q196.4063,271.1875 196.9688,271.4844 L196.9688,274.2031 Q196.3438,273.625 195.75,273.3594 Q195.1563,273.0781 194.5313,273.0781 Q193.1875,273.0781 192.5,274.1563 Q191.8125,275.2188 191.8125,277.3125 Q191.8125,279.4063 192.5,280.4844 Q193.1875,281.5469 194.5313,281.5469 Q195.1563,281.5469 195.75,281.2813 Q196.3438,281 196.9688,280.4219 L196.9688,283.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="208" y="281.6543">TBase</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="293.5" y2="293.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="301.5" y2="301.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/>
       <ellipse cx="338.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M341.7188,276.6406 Q341.1406,276.9375 340.5,277.0781 Q339.8594,277.2344 339.1563,277.2344 Q336.6563,277.2344 335.3281,275.5938 Q334.0156,273.9375 334.0156,270.8125 Q334.0156,267.6875 335.3281,266.0313 Q336.6563,264.375 339.1563,264.375 Q339.8594,264.375 340.5,264.5313 Q341.1563,264.6875 341.7188,264.9844 L341.7188,267.7031 Q341.0938,267.125 340.5,266.8594 Q339.9063,266.5781 339.2813,266.5781 Q337.9375,266.5781 337.25,267.6563 Q336.5625,268.7188 336.5625,270.8125 Q336.5625,272.9063 337.25,273.9844 Q337.9375,275.0469 339.2813,275.0469 Q339.9063,275.0469 340.5,274.7813 Q341.0938,274.5 341.7188,273.9219 L341.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="275.1543">A</text>
@@ -35,8 +35,8 @@
       <ellipse cx="295" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="304" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/>
       <ellipse cx="499.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M502.7188,276.6406 Q502.1406,276.9375 501.5,277.0781 Q500.8594,277.2344 500.1563,277.2344 Q497.6563,277.2344 496.3281,275.5938 Q495.0156,273.9375 495.0156,270.8125 Q495.0156,267.6875 496.3281,266.0313 Q497.6563,264.375 500.1563,264.375 Q500.8594,264.375 501.5,264.5313 Q502.1563,264.6875 502.7188,264.9844 L502.7188,267.7031 Q502.0938,267.125 501.5,266.8594 Q500.9063,266.5781 500.2813,266.5781 Q498.9375,266.5781 498.25,267.6563 Q497.5625,268.7188 497.5625,270.8125 Q497.5625,272.9063 498.25,273.9844 Q498.9375,275.0469 500.2813,275.0469 Q500.9063,275.0469 501.5,274.7813 Q502.0938,274.5 502.7188,273.9219 L502.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="520.25" y="275.1543">B</text>
@@ -45,8 +45,8 @@
       <ellipse cx="456" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="465" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/>
       <ellipse cx="660.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M663.7188,276.6406 Q663.1406,276.9375 662.5,277.0781 Q661.8594,277.2344 661.1563,277.2344 Q658.6563,277.2344 657.3281,275.5938 Q656.0156,273.9375 656.0156,270.8125 Q656.0156,267.6875 657.3281,266.0313 Q658.6563,264.375 661.1563,264.375 Q661.8594,264.375 662.5,264.5313 Q663.1563,264.6875 663.7188,264.9844 L663.7188,267.7031 Q663.0938,267.125 662.5,266.8594 Q661.9063,266.5781 661.2813,266.5781 Q659.9375,266.5781 659.25,267.6563 Q658.5625,268.7188 658.5625,270.8125 Q658.5625,272.9063 659.25,273.9844 Q659.9375,275.0469 661.2813,275.0469 Q661.9063,275.0469 662.5,274.7813 Q663.0938,274.5 663.7188,273.9219 L663.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="681.25" y="275.1543">C</text>
@@ -55,8 +55,8 @@
       <ellipse cx="617" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="626" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L26" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L26" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="6" y="255"/>
       <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="35" y="275.1543">Overload</text>
@@ -64,15 +64,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="99" y="264.1387">T,L,Ts...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L28" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L28" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="301.2104">counter : L</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="307.8047" y2="307.8047"/>
-    <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/>
+    <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/>
     <ellipse cx="270" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M272.9688,167.6406 Q272.3906,167.9375 271.75,168.0781 Q271.1094,168.2344 270.4063,168.2344 Q267.9063,168.2344 266.5781,166.5938 Q265.2656,164.9375 265.2656,161.8125 Q265.2656,158.6875 266.5781,157.0313 Q267.9063,155.375 270.4063,155.375 Q271.1094,155.375 271.75,155.5313 Q272.4063,155.6875 272.9688,155.9844 L272.9688,158.7031 Q272.3438,158.125 271.75,157.8594 Q271.1563,157.5781 270.5313,157.5781 Q269.1875,157.5781 268.5,158.6563 Q267.8125,159.7188 267.8125,161.8125 Q267.8125,163.9063 268.5,164.9844 Q269.1875,166.0469 270.5313,166.0469 Q271.1563,166.0469 271.75,165.7813 Q272.3438,165.5 272.9688,164.9219 L272.9688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="284" y="166.1543">Overload</text>
@@ -80,18 +80,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="348" y="155.1387">TBase,int,A,B,C</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fsc6o2d3ps4h5)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L33" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L33" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jmlh8qxpl814)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/>
       <ellipse cx="338.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M341.7188,29.6406 Q341.1406,29.9375 340.5,30.0781 Q339.8594,30.2344 339.1563,30.2344 Q336.6563,30.2344 335.3281,28.5938 Q334.0156,26.9375 334.0156,23.8125 Q334.0156,20.6875 335.3281,19.0313 Q336.6563,17.375 339.1563,17.375 Q339.8594,17.375 340.5,17.5313 Q341.1563,17.6875 341.7188,17.9844 L341.7188,20.7031 Q341.0938,20.125 340.5,19.8594 Q339.9063,19.5781 339.2813,19.5781 Q337.9375,19.5781 337.25,20.6563 Q336.5625,21.7188 336.5625,23.8125 Q336.5625,25.9063 337.25,26.9844 Q337.9375,28.0469 339.2813,28.0469 Q339.9063,28.0469 340.5,27.7813 Q341.0938,27.5 341.7188,26.9219 L341.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="230.5" y="46"/>
       <ellipse cx="235.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L34" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00032/t00032.cc#L34" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="244.5" y="54.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 2e76310c..0d36288b 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="570px" preserveAspectRatio="none" style="width:435px;height:570px;" version="1.1" viewBox="0 0 435 570" width="435px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkm9ewai6vggz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ihwgxqvewtod" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
       <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="137.5" y="264.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="293"/>
       <ellipse cx="87.5" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="301.2104">aaa : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="307.8047" y2="307.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
       <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
@@ -35,16 +35,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="269.5" y="386.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="415"/>
       <ellipse cx="219.5" cy="420" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="423.2104">bbb : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="429.8047" y2="429.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
       <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
@@ -52,30 +52,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="311" y="508.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="537"/>
       <ellipse cx="264" cy="542" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="545.2104">ccc : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="551.8047" y2="551.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
       <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="537"/>
       <ellipse cx="362" cy="542" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="545.2104">ddd : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="551.8047" y2="551.8047"/>
-    <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
+    <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
     <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="356" y="392.6387">D</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="415.5" y2="415.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="423.5" y2="423.5"/>
-    <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
+    <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
     <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="270.6387">std::unique_ptr&lt;C&lt;D&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="293.5" y2="293.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="301.5" y2="301.5"/>
-    <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
+    <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
     <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
@@ -99,18 +99,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="179" x="64" y="155.1387">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkm9ewai6vggz)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ihwgxqvewtod)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
       <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="54.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index c391f4b1..43eeb81c 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="218px" preserveAspectRatio="none" style="width:866px;height:218px;" version="1.1" viewBox="0 0 866 218" width="866px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fje7uul4wnkvl" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f14skltn9e5xoe" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="6" y="8"/>
       <ellipse cx="112.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.7188,29.6406 Q115.1406,29.9375 114.5,30.0781 Q113.8594,30.2344 113.1563,30.2344 Q110.6563,30.2344 109.3281,28.5938 Q108.0156,26.9375 108.0156,23.8125 Q108.0156,20.6875 109.3281,19.0313 Q110.6563,17.375 113.1563,17.375 Q113.8594,17.375 114.5,17.5313 Q115.1563,17.6875 115.7188,17.9844 L115.7188,20.7031 Q115.0938,20.125 114.5,19.8594 Q113.9063,19.5781 113.2813,19.5781 Q111.9375,19.5781 111.25,20.6563 Q110.5625,21.7188 110.5625,23.8125 Q110.5625,25.9063 111.25,26.9844 Q111.9375,28.0469 113.2813,28.0469 Q113.9063,28.0469 114.5,27.7813 Q115.0938,27.5 115.7188,26.9219 L115.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="133.25" y="28.1543">Void</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="217" x="26" y="75.0151">operator!=(const Void &amp; ) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="413" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="413" y="159"/>
       <ellipse cx="428" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M430.9688,180.6406 Q430.3906,180.9375 429.75,181.0781 Q429.1094,181.2344 428.4063,181.2344 Q425.9063,181.2344 424.5781,179.5938 Q423.2656,177.9375 423.2656,174.8125 Q423.2656,171.6875 424.5781,170.0313 Q425.9063,168.375 428.4063,168.375 Q429.1094,168.375 429.75,168.5313 Q430.4063,168.6875 430.9688,168.9844 L430.9688,171.7031 Q430.3438,171.125 429.75,170.8594 Q429.1563,170.5781 428.5313,170.5781 Q427.1875,170.5781 426.5,171.6563 Q425.8125,172.7188 425.8125,174.8125 Q425.8125,176.9063 426.5,177.9844 Q427.1875,179.0469 428.5313,179.0469 Q429.1563,179.0469 429.75,178.7813 Q430.3438,178.5 430.9688,177.9219 L430.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="442" y="179.1543">lift_void</text>
@@ -31,16 +31,16 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="501" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="414" x2="501" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0002248590285629363950" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="290.5" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0002248590285629363950" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="290.5" y="21"/>
       <ellipse cx="305.5" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M308.4688,42.6406 Q307.8906,42.9375 307.25,43.0781 Q306.6094,43.2344 305.9063,43.2344 Q303.4063,43.2344 302.0781,41.5938 Q300.7656,39.9375 300.7656,36.8125 Q300.7656,33.6875 302.0781,32.0313 Q303.4063,30.375 305.9063,30.375 Q306.6094,30.375 307.25,30.5313 Q307.9063,30.6875 308.4688,30.9844 L308.4688,33.7031 Q307.8438,33.125 307.25,32.8594 Q306.6563,32.5781 306.0313,32.5781 Q304.6875,32.5781 304,33.6563 Q303.3125,34.7188 303.3125,36.8125 Q303.3125,38.9063 304,39.9844 Q304.6875,41.0469 306.0313,41.0469 Q306.6563,41.0469 307.25,40.7813 Q307.8438,40.5 308.4688,39.9219 L308.4688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="319.5" y="41.1543">lift_void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="291.5" x2="367.5" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="291.5" x2="367.5" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="404" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="404" y="21"/>
       <ellipse cx="419" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M421.9688,42.6406 Q421.3906,42.9375 420.75,43.0781 Q420.1094,43.2344 419.4063,43.2344 Q416.9063,43.2344 415.5781,41.5938 Q414.2656,39.9375 414.2656,36.8125 Q414.2656,33.6875 415.5781,32.0313 Q416.9063,30.375 419.4063,30.375 Q420.1094,30.375 420.75,30.5313 Q421.4063,30.6875 421.9688,30.9844 L421.9688,33.7031 Q421.3438,33.125 420.75,32.8594 Q420.1563,32.5781 419.5313,32.5781 Q418.1875,32.5781 417.5,33.6563 Q416.8125,34.7188 416.8125,36.8125 Q416.8125,38.9063 417.5,39.9844 Q418.1875,41.0469 419.5313,41.0469 Q420.1563,41.0469 420.75,40.7813 Q421.3438,40.5 421.9688,39.9219 L421.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="433" y="41.1543">lift_void</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="510" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="405" x2="510" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556" y="159"/>
       <ellipse cx="571" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M573.9688,180.6406 Q573.3906,180.9375 572.75,181.0781 Q572.1094,181.2344 571.4063,181.2344 Q568.9063,181.2344 567.5781,179.5938 Q566.2656,177.9375 566.2656,174.8125 Q566.2656,171.6875 567.5781,170.0313 Q568.9063,168.375 571.4063,168.375 Q572.1094,168.375 572.75,168.5313 Q573.4063,168.6875 573.9688,168.9844 L573.9688,171.7031 Q573.3438,171.125 572.75,170.8594 Q572.1563,170.5781 571.5313,170.5781 Q570.1875,170.5781 569.5,171.6563 Q568.8125,172.7188 568.8125,174.8125 Q568.8125,176.9063 569.5,177.9844 Q570.1875,179.0469 571.5313,179.0469 Q572.1563,179.0469 572.75,178.7813 Q573.3438,178.5 573.9688,177.9219 L573.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="585" y="179.1543">drop_void</text>
@@ -59,16 +59,16 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557" x2="658" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557" x2="658" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001117137420252603013" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="84.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0001117137420252603013" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="84.5" y="159"/>
       <ellipse cx="99.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M102.4688,180.6406 Q101.8906,180.9375 101.25,181.0781 Q100.6094,181.2344 99.9063,181.2344 Q97.4063,181.2344 96.0781,179.5938 Q94.7656,177.9375 94.7656,174.8125 Q94.7656,171.6875 96.0781,170.0313 Q97.4063,168.375 99.9063,168.375 Q100.6094,168.375 101.25,168.5313 Q101.9063,168.6875 102.4688,168.9844 L102.4688,171.7031 Q101.8438,171.125 101.25,170.8594 Q100.6563,170.5781 100.0313,170.5781 Q98.6875,170.5781 98,171.6563 Q97.3125,172.7188 97.3125,174.8125 Q97.3125,176.9063 98,177.9844 Q98.6875,179.0469 100.0313,179.0469 Q100.6563,179.0469 101.25,178.7813 Q101.8438,178.5 102.4688,177.9219 L102.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="113.5" y="179.1543">drop_void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85.5" x2="175.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85.5" x2="175.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="546" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="546" y="21"/>
       <ellipse cx="561" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M563.9688,42.6406 Q563.3906,42.9375 562.75,43.0781 Q562.1094,43.2344 561.4063,43.2344 Q558.9063,43.2344 557.5781,41.5938 Q556.2656,39.9375 556.2656,36.8125 Q556.2656,33.6875 557.5781,32.0313 Q558.9063,30.375 561.4063,30.375 Q562.1094,30.375 562.75,30.5313 Q563.4063,30.6875 563.9688,30.9844 L563.9688,33.7031 Q563.3438,33.125 562.75,32.8594 Q562.1563,32.5781 561.5313,32.5781 Q560.1875,32.5781 559.5,33.6563 Q558.8125,34.7188 558.8125,36.8125 Q558.8125,38.9063 559.5,39.9844 Q560.1875,41.0469 561.5313,41.0469 Q562.1563,41.0469 562.75,40.7813 Q563.3438,40.5 563.9688,39.9219 L563.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="575" y="41.1543">drop_void</text>
@@ -77,33 +77,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="547" x2="668" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="547" x2="668" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="759.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="759.5" y="159"/>
       <ellipse cx="774.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M777.4688,180.6406 Q776.8906,180.9375 776.25,181.0781 Q775.6094,181.2344 774.9063,181.2344 Q772.4063,181.2344 771.0781,179.5938 Q769.7656,177.9375 769.7656,174.8125 Q769.7656,171.6875 771.0781,170.0313 Q772.4063,168.375 774.9063,168.375 Q775.6094,168.375 776.25,168.5313 Q776.9063,168.6875 777.4688,168.9844 L777.4688,171.7031 Q776.8438,171.125 776.25,170.8594 Q775.6563,170.5781 775.0313,170.5781 Q773.6875,170.5781 773,171.6563 Q772.3125,172.7188 772.3125,174.8125 Q772.3125,176.9063 773,177.9844 Q773.6875,179.0469 775.0313,179.0469 Q775.6563,179.0469 776.25,178.7813 Q776.8438,178.5 777.4688,177.9219 L777.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="788.5" y="179.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="798.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="760.5" x2="798.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L46" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fje7uul4wnkvl)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="704" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L46" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14skltn9e5xoe)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="704" y="8"/>
       <ellipse cx="771.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M774.2188,29.6406 Q773.6406,29.9375 773,30.0781 Q772.3594,30.2344 771.6563,30.2344 Q769.1563,30.2344 767.8281,28.5938 Q766.5156,26.9375 766.5156,23.8125 Q766.5156,20.6875 767.8281,19.0313 Q769.1563,17.375 771.6563,17.375 Q772.3594,17.375 773,17.5313 Q773.6563,17.6875 774.2188,17.9844 L774.2188,20.7031 Q773.5938,20.125 773,19.8594 Q772.4063,19.5781 771.7813,19.5781 Q770.4375,19.5781 769.75,20.6563 Q769.0625,21.7188 769.0625,23.8125 Q769.0625,25.9063 769.75,26.9844 Q770.4375,28.0469 771.7813,28.0469 Q772.4063,28.0469 773,27.7813 Q773.5938,27.5 774.2188,26.9219 L774.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="791.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="854" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="710" y="46"/>
       <ellipse cx="715" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L47" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="la" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="724" y="54.2104">la : lift_void_t&lt;A&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="710" y="58.8047"/>
       <ellipse cx="715" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L48" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00034/t00034.cc#L48" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="724" y="67.0151">lv : lift_void_t&lt;void&gt; *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="705" x2="854" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index 42e093c2..2b91e175 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:280px;height:283px;" version="1.1" viewBox="0 0 280 283" width="280px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hfximd8o2w6s" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4jrvl9xeyevz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4jrvl9xeyevz)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
       <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L7" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L7" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L7" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L7" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4jrvl9xeyevz)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="35" y="136.1543">Left</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L10" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L10" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4jrvl9xeyevz)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
       <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L13" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L13" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L13" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L13" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4jrvl9xeyevz)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
       <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L16" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00035/t00035.cc#L16" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hfximd8o2w6s)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L16" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00035/t00035.cc#L16" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4jrvl9xeyevz)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
       <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 6ddf571f..3c65383a 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1wr55gdnpzeq9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1w0a2y8ycihrr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1w0a2y8ycihrr)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1w0a2y8ycihrr)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
-    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1w0a2y8ycihrr)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
-    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1w0a2y8ycihrr)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1wr55gdnpzeq9)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1w0a2y8ycihrr)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w0a2y8ycihrr)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
       <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
@@ -34,8 +34,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="44.5" y="198.0151">yellow</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="204.6094" y2="204.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w0a2y8ycihrr)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
       <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
@@ -43,15 +43,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="421.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="450"/>
       <ellipse cx="179" cy="455" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="458.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="464.8047" y2="464.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <rect fill="#FEFECE" filter="url(#f1w0a2y8ycihrr)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
     <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
@@ -59,23 +59,23 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="210" y="312.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="335" y2="335"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="343" y2="343"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w0a2y8ycihrr)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
       <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="183.5"/>
       <ellipse cx="153" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="191.7104">a_int : A&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="198.3047" y2="198.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wr55gdnpzeq9)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1w0a2y8ycihrr)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
       <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index f60051fd..386bc2bc 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7hofzfyhcdce" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1odwz4otbs0hx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,98 +9,98 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odwz4otbs0hx)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
       <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
       <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_620)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_739)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odwz4otbs0hx)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
       <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348"/>
       <ellipse cx="17" cy="353" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="356.2104">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360.8047"/>
       <ellipse cx="17" cy="365.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="369.0151">x : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="373.6094"/>
       <ellipse cx="17" cy="378.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="381.8198">y : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="386.4141"/>
       <ellipse cx="17" cy="391.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="394.6245">z : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="401.2188" y2="401.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odwz4otbs0hx)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
       <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="360.5"/>
       <ellipse cx="188" cy="365.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="368.7104">c : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="373.3047"/>
       <ellipse cx="188" cy="378.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="381.5151">h : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="388.1094" y2="388.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7hofzfyhcdce)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1odwz4otbs0hx)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
       <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="54.2104">st : ST</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index 3d0a5f09..f8c46d96 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:2325px;height:321px;" version="1.1" viewBox="0 0 2325 321" width="2325px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ane1pbfeux41" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1b6e8kv8wrxkl" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="281.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="281.5" y="224"/>
       <ellipse cx="296.5" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M300.6094,246 L292.8906,246 L292.8906,233.6094 L300.6094,233.6094 L300.6094,235.7656 L295.3438,235.7656 L295.3438,238.4375 L300.1094,238.4375 L300.1094,240.5938 L295.3438,240.5938 L295.3438,243.8438 L300.6094,243.8438 L300.6094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="310.5" y="244.1543">thirdparty::ns1::color_t</text>
@@ -20,16 +20,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="287.5" y="295.8198">blue</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="282.5" x2="454.5" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="132.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="132.5" y="8"/>
       <ellipse cx="147.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M150.4688,29.6406 Q149.8906,29.9375 149.25,30.0781 Q148.6094,30.2344 147.9063,30.2344 Q145.4063,30.2344 144.0781,28.5938 Q142.7656,26.9375 142.7656,23.8125 Q142.7656,20.6875 144.0781,19.0313 Q145.4063,17.375 147.9063,17.375 Q148.6094,17.375 149.25,17.5313 Q149.9063,17.6875 150.4688,17.9844 L150.4688,20.7031 Q149.8438,20.125 149.25,19.8594 Q148.6563,19.5781 148.0313,19.5781 Q146.6875,19.5781 146,20.6563 Q145.3125,21.7188 145.3125,23.8125 Q145.3125,25.9063 146,26.9844 Q146.6875,28.0469 148.0313,28.0469 Q148.6563,28.0469 149.25,27.7813 Q149.8438,27.5 150.4688,26.9219 L150.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="161.5" y="28.1543">thirdparty::ns1::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133.5" x2="271.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133.5" x2="271.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L22" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1388.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L22" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1388.5" y="224"/>
       <ellipse cx="1403.5" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1407.6094,246 L1399.8906,246 L1399.8906,233.6094 L1407.6094,233.6094 L1407.6094,235.7656 L1402.3438,235.7656 L1402.3438,238.4375 L1407.1094,238.4375 L1407.1094,240.5938 L1402.3438,240.5938 L1402.3438,243.8438 L1407.6094,243.8438 L1407.6094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1417.5" y="244.1543">property_t</text>
@@ -39,47 +39,47 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1394.5" y="295.8198">property_c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1389.5" x2="1483.5" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1416.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L24" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1416.5" y="8"/>
       <ellipse cx="1431.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1434.4688,29.6406 Q1433.8906,29.9375 1433.25,30.0781 Q1432.6094,30.2344 1431.9063,30.2344 Q1429.4063,30.2344 1428.0781,28.5938 Q1426.7656,26.9375 1426.7656,23.8125 Q1426.7656,20.6875 1428.0781,19.0313 Q1429.4063,17.375 1431.9063,17.375 Q1432.6094,17.375 1433.25,17.5313 Q1433.9063,17.6875 1434.4688,17.9844 L1434.4688,20.7031 Q1433.8438,20.125 1433.25,19.8594 Q1432.6563,19.5781 1432.0313,19.5781 Q1430.6875,19.5781 1430,20.6563 Q1429.3125,21.7188 1429.3125,23.8125 Q1429.3125,25.9063 1430,26.9844 Q1430.6875,28.0469 1432.0313,28.0469 Q1432.6563,28.0469 1433.25,27.7813 Q1433.8438,27.5 1434.4688,26.9219 L1434.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1445.5" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1417.5" x2="1455.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1417.5" x2="1455.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="909.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="909.5" y="8"/>
       <ellipse cx="924.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M927.4688,29.6406 Q926.8906,29.9375 926.25,30.0781 Q925.6094,30.2344 924.9063,30.2344 Q922.4063,30.2344 921.0781,28.5938 Q919.7656,26.9375 919.7656,23.8125 Q919.7656,20.6875 921.0781,19.0313 Q922.4063,17.375 924.9063,17.375 Q925.6094,17.375 926.25,17.5313 Q926.9063,17.6875 927.4688,17.9844 L927.4688,20.7031 Q926.8438,20.125 926.25,19.8594 Q925.6563,19.5781 925.0313,19.5781 Q923.6875,19.5781 923,20.6563 Q922.3125,21.7188 922.3125,23.8125 Q922.3125,25.9063 923,26.9844 Q923.6875,28.0469 925.0313,28.0469 Q925.6563,28.0469 926.25,27.7813 Q926.8438,27.5 927.4688,26.9219 L927.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="938.5" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="910.5" x2="948.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="910.5" x2="948.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1978.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1978.5" y="8"/>
       <ellipse cx="1993.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1996.4688,29.6406 Q1995.8906,29.9375 1995.25,30.0781 Q1994.6094,30.2344 1993.9063,30.2344 Q1991.4063,30.2344 1990.0781,28.5938 Q1988.7656,26.9375 1988.7656,23.8125 Q1988.7656,20.6875 1990.0781,19.0313 Q1991.4063,17.375 1993.9063,17.375 Q1994.6094,17.375 1995.25,17.5313 Q1995.9063,17.6875 1996.4688,17.9844 L1996.4688,20.7031 Q1995.8438,20.125 1995.25,19.8594 Q1994.6563,19.5781 1994.0313,19.5781 Q1992.6875,19.5781 1992,20.6563 Q1991.3125,21.7188 1991.3125,23.8125 Q1991.3125,25.9063 1992,26.9844 Q1992.6875,28.0469 1994.0313,28.0469 Q1994.6563,28.0469 1995.25,27.7813 Q1995.8438,27.5 1996.4688,26.9219 L1996.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="2007.5" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1979.5" x2="2017.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1979.5" x2="2017.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L31" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L31" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1940.5" y="236.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L31" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L31" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1940.5" y="236.5"/>
       <ellipse cx="1978.9" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1981.8688,258.1406 Q1981.2906,258.4375 1980.65,258.5781 Q1980.0094,258.7344 1979.3063,258.7344 Q1976.8063,258.7344 1975.4781,257.0938 Q1974.1656,255.4375 1974.1656,252.3125 Q1974.1656,249.1875 1975.4781,247.5313 Q1976.8063,245.875 1979.3063,245.875 Q1980.0094,245.875 1980.65,246.0313 Q1981.3063,246.1875 1981.8688,246.4844 L1981.8688,249.2031 Q1981.2438,248.625 1980.65,248.3594 Q1980.0563,248.0781 1979.4313,248.0781 Q1978.0875,248.0781 1977.4,249.1563 Q1976.7125,250.2188 1976.7125,252.3125 Q1976.7125,254.4063 1977.4,255.4844 Q1978.0875,256.5469 1979.4313,256.5469 Q1980.0563,256.5469 1980.65,256.2813 Q1981.2438,256 1981.8688,255.4219 L1981.8688,258.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1998.1" y="256.6543">key_t</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1941.5" x2="2055.5" y1="268.5" y2="268.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1946.5" y="274.5"/>
       <ellipse cx="1951.5" cy="279.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L32" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L32" xlink:show="new" xlink:title="key" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1960.5" y="282.7104">key : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1941.5" x2="2055.5" y1="289.3047" y2="289.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L35" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L35" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="1088.5" y="243"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L35" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L35" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="1088.5" y="243"/>
       <ellipse cx="1103.5" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1106.4688,264.6406 Q1105.8906,264.9375 1105.25,265.0781 Q1104.6094,265.2344 1103.9063,265.2344 Q1101.4063,265.2344 1100.0781,263.5938 Q1098.7656,261.9375 1098.7656,258.8125 Q1098.7656,255.6875 1100.0781,254.0313 Q1101.4063,252.375 1103.9063,252.375 Q1104.6094,252.375 1105.25,252.5313 Q1105.9063,252.6875 1106.4688,252.9844 L1106.4688,255.7031 Q1105.8438,255.125 1105.25,254.8594 Q1104.6563,254.5781 1104.0313,254.5781 Q1102.6875,254.5781 1102,255.6563 Q1101.3125,256.7188 1101.3125,258.8125 Q1101.3125,260.9063 1102,261.9844 Q1102.6875,263.0469 1104.0313,263.0469 Q1104.6563,263.0469 1105.25,262.7813 Q1105.8438,262.5 1106.4688,261.9219 L1106.4688,264.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1117.5" y="263.1543">map</text>
@@ -88,16 +88,16 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1089.5" x2="1157.5" y1="275" y2="275"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1089.5" x2="1157.5" y1="283" y2="283"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001396273728762362113" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0001396273728762362113" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="64" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="64" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="100.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L40" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L40" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="100.5" y="116"/>
       <ellipse cx="115.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M118.4688,137.6406 Q117.8906,137.9375 117.25,138.0781 Q116.6094,138.2344 115.9063,138.2344 Q113.4063,138.2344 112.0781,136.5938 Q110.7656,134.9375 110.7656,131.8125 Q110.7656,128.6875 112.0781,127.0313 Q113.4063,125.375 115.9063,125.375 Q116.6094,125.375 117.25,125.5313 Q117.9063,125.6875 118.4688,125.9844 L118.4688,128.7031 Q117.8438,128.125 117.25,127.8594 Q116.6563,127.5781 116.0313,127.5781 Q114.6875,127.5781 114,128.6563 Q113.3125,129.7188 113.3125,131.8125 Q113.3125,133.9063 114,134.9844 Q114.6875,136.0469 116.0313,136.0469 Q116.6563,136.0469 117.25,135.7813 Q117.8438,135.5 118.4688,134.9219 L118.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="129.5" y="136.1543">map</text>
@@ -106,8 +106,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="101.5" x2="635.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="101.5" x2="635.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L44" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L44" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="1222" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L44" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L44" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="1222" y="116"/>
       <ellipse cx="1237" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.9688,137.6406 Q1239.3906,137.9375 1238.75,138.0781 Q1238.1094,138.2344 1237.4063,138.2344 Q1234.9063,138.2344 1233.5781,136.5938 Q1232.2656,134.9375 1232.2656,131.8125 Q1232.2656,128.6875 1233.5781,127.0313 Q1234.9063,125.375 1237.4063,125.375 Q1238.1094,125.375 1238.75,125.5313 Q1239.4063,125.6875 1239.9688,125.9844 L1239.9688,128.7031 Q1239.3438,128.125 1238.75,127.8594 Q1238.1563,127.5781 1237.5313,127.5781 Q1236.1875,127.5781 1235.5,128.6563 Q1234.8125,129.7188 1234.8125,131.8125 Q1234.8125,133.9063 1235.5,134.9844 Q1236.1875,136.0469 1237.5313,136.0469 Q1238.1563,136.0469 1238.75,135.7813 Q1239.3438,135.5 1239.9688,134.9219 L1239.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1251" y="136.1543">map</text>
@@ -116,8 +116,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1223" x2="1650" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1223" x2="1650" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L49" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L49" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="672" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L49" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L49" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="672" y="116"/>
       <ellipse cx="687" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M689.9688,137.6406 Q689.3906,137.9375 688.75,138.0781 Q688.1094,138.2344 687.4063,138.2344 Q684.9063,138.2344 683.5781,136.5938 Q682.2656,134.9375 682.2656,131.8125 Q682.2656,128.6875 683.5781,127.0313 Q684.9063,125.375 687.4063,125.375 Q688.1094,125.375 688.75,125.5313 Q689.4063,125.6875 689.9688,125.9844 L689.9688,128.7031 Q689.3438,128.125 688.75,127.8594 Q688.1563,127.5781 687.5313,127.5781 Q686.1875,127.5781 685.5,128.6563 Q684.8125,129.7188 684.8125,131.8125 Q684.8125,133.9063 685.5,134.9844 Q686.1875,136.0469 687.5313,136.0469 Q688.1563,136.0469 688.75,135.7813 Q689.3438,135.5 689.9688,134.9219 L689.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="701" y="136.1543">map</text>
@@ -126,8 +126,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="673" x2="1186" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="673" x2="1186" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L55" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00038/t00038.cc#L55" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ane1pbfeux41)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1686" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L55" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00038/t00038.cc#L55" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1b6e8kv8wrxkl)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1686" y="116"/>
       <ellipse cx="1701" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1703.9688,137.6406 Q1703.3906,137.9375 1702.75,138.0781 Q1702.1094,138.2344 1701.4063,138.2344 Q1698.9063,138.2344 1697.5781,136.5938 Q1696.2656,134.9375 1696.2656,131.8125 Q1696.2656,128.6875 1697.5781,127.0313 Q1698.9063,125.375 1701.4063,125.375 Q1702.1094,125.375 1702.75,125.5313 Q1703.4063,125.6875 1703.9688,125.9844 L1703.9688,128.7031 Q1703.3438,128.125 1702.75,127.8594 Q1702.1563,127.5781 1701.5313,127.5781 Q1700.1875,127.5781 1699.5,128.6563 Q1698.8125,129.7188 1698.8125,131.8125 Q1698.8125,133.9063 1699.5,134.9844 Q1700.1875,136.0469 1701.5313,136.0469 Q1702.1563,136.0469 1702.75,135.7813 Q1703.3438,135.5 1703.9688,134.9219 L1703.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1715" y="136.1543">map</text>
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index b72cee90..7015851b 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bborplx8ir7k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fq2ogwb0w80n5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
       <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
       <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
       <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L21" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L21" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L21" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L21" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
       <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L24" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L24" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
       <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L27" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L27" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
       <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L30" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L30" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
       <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L33" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L33" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L33" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L33" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
       <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
       <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="288"/>
       <ellipse cx="270" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L37" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L37" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="296.2104">b : B *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L41" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L41" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L41" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L41" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
       <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L51" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L51" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
       <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
@@ -105,16 +105,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="523" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="46"/>
       <ellipse cx="458" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L52" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="54.2104">t : T *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L55" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L55" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L55" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L55" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
       <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
@@ -122,16 +122,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="450.5" y="138.1387">T,M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="167"/>
       <ellipse cx="378.5" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L56" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L56" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="175.2104">m : M *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L59" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L59" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L59" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L59" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
       <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
@@ -139,16 +139,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="589" y="138.1387">T,M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="167"/>
       <ellipse cx="516" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L60" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L60" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="175.2104">m : M *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L63" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L63" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bborplx8ir7k)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L63" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L63" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fq2ogwb0w80n5)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
       <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
@@ -156,11 +156,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="34" x="447.5" y="259.1387">T,M,N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="288"/>
       <ellipse cx="368.5" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L64" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00039/t00039.cc#L64" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="296.2104">n : N *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="302.8047" y2="302.8047"/>
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index a12fdaf4..e4930743 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f138ylxx2mad24" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc2emg4d5tekq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,50 +9,50 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc2emg4d5tekq)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
       <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <polygon fill="none" points="24,46,28,50,24,54,20,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L11" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L11" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="54.2104">ii_ : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
     <ellipse cx="24" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="75.0151">get_a() : int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L19" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L19" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L19" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L19" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc2emg4d5tekq)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
       <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L23" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L23" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L23" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L23" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc2emg4d5tekq)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
       <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
       <ellipse cx="17" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L26" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L26" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="296.2104">b : B *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
     <ellipse cx="17" cy="313.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="317.0151">get_aaa() : int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f138ylxx2mad24)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00040/t00040.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc2emg4d5tekq)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
       <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index 0782831e..d2547a5d 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="368px" preserveAspectRatio="none" style="width:422px;height:368px;" version="1.1" viewBox="0 0 422 368" width="422px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pzqnhyncheix" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgr4lv79l0wmo" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,100 +9,100 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="55" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L12" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L12" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="55" y="14.5"/>
       <ellipse cx="70" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M72.9688,36.1406 Q72.3906,36.4375 71.75,36.5781 Q71.1094,36.7344 70.4063,36.7344 Q67.9063,36.7344 66.5781,35.0938 Q65.2656,33.4375 65.2656,30.3125 Q65.2656,27.1875 66.5781,25.5313 Q67.9063,23.875 70.4063,23.875 Q71.1094,23.875 71.75,24.0313 Q72.4063,24.1875 72.9688,24.4844 L72.9688,27.2031 Q72.3438,26.625 71.75,26.3594 Q71.1563,26.0781 70.5313,26.0781 Q69.1875,26.0781 68.5,27.1563 Q67.8125,28.2188 67.8125,30.3125 Q67.8125,32.4063 68.5,33.4844 Q69.1875,34.5469 70.5313,34.5469 Q71.1563,34.5469 71.75,34.2813 Q72.3438,34 72.9688,33.4219 L72.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="84" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="56" x2="94" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="56" x2="94" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="130" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L17" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="130" y="8"/>
       <ellipse cx="158.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M161.9188,29.6406 Q161.3406,29.9375 160.7,30.0781 Q160.0594,30.2344 159.3563,30.2344 Q156.8563,30.2344 155.5281,28.5938 Q154.2156,26.9375 154.2156,23.8125 Q154.2156,20.6875 155.5281,19.0313 Q156.8563,17.375 159.3563,17.375 Q160.0594,17.375 160.7,17.5313 Q161.3563,17.6875 161.9188,17.9844 L161.9188,20.7031 Q161.2938,20.125 160.7,19.8594 Q160.1063,19.5781 159.4813,19.5781 Q158.1375,19.5781 157.45,20.6563 Q156.7625,21.7188 156.7625,23.8125 Q156.7625,25.9063 157.45,26.9844 Q158.1375,28.0469 159.4813,28.0469 Q160.1063,28.0469 160.7,27.7813 Q161.2938,27.5 161.9188,26.9219 L161.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="176.05" y="28.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131" x2="201" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="136" y="46"/>
       <ellipse cx="141" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L18" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L18" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="150" y="54.2104">rr : RR *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="131" x2="201" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="309"/>
       <ellipse cx="21" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,330.6406 Q23.3906,330.9375 22.75,331.0781 Q22.1094,331.2344 21.4063,331.2344 Q18.9063,331.2344 17.5781,329.5938 Q16.2656,327.9375 16.2656,324.8125 Q16.2656,321.6875 17.5781,320.0313 Q18.9063,318.375 21.4063,318.375 Q22.1094,318.375 22.75,318.5313 Q23.4063,318.6875 23.9688,318.9844 L23.9688,321.7031 Q23.3438,321.125 22.75,320.8594 Q22.1563,320.5781 21.5313,320.5781 Q20.1875,320.5781 19.5,321.6563 Q18.8125,322.7188 18.8125,324.8125 Q18.8125,326.9063 19.5,327.9844 Q20.1875,329.0469 21.5313,329.0469 Q22.1563,329.0469 22.75,328.7813 Q23.3438,328.5 23.9688,327.9219 L23.9688,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="329.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="341" y2="341"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="349" y2="349"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L24" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L24" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L24" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L24" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="309"/>
       <ellipse cx="96.5" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,330.6406 Q98.8906,330.9375 98.25,331.0781 Q97.6094,331.2344 96.9063,331.2344 Q94.4063,331.2344 93.0781,329.5938 Q91.7656,327.9375 91.7656,324.8125 Q91.7656,321.6875 93.0781,320.0313 Q94.4063,318.375 96.9063,318.375 Q97.6094,318.375 98.25,318.5313 Q98.9063,318.6875 99.4688,318.9844 L99.4688,321.7031 Q98.8438,321.125 98.25,320.8594 Q97.6563,320.5781 97.0313,320.5781 Q95.6875,320.5781 95,321.6563 Q94.3125,322.7188 94.3125,324.8125 Q94.3125,326.9063 95,327.9844 Q95.6875,329.0469 97.0313,329.0469 Q97.6563,329.0469 98.25,328.7813 Q98.8438,328.5 99.4688,327.9219 L99.4688,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="329.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="341" y2="341"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="349" y2="349"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L32" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="86.4141" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="49.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L32" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L32" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="86.4141" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="49.5" y="146"/>
       <ellipse cx="89.25" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M92.2188,167.6406 Q91.6406,167.9375 91,168.0781 Q90.3594,168.2344 89.6563,168.2344 Q87.1563,168.2344 85.8281,166.5938 Q84.5156,164.9375 84.5156,161.8125 Q84.5156,158.6875 85.8281,157.0313 Q87.1563,155.375 89.6563,155.375 Q90.3594,155.375 91,155.5313 Q91.6563,155.6875 92.2188,155.9844 L92.2188,158.7031 Q91.5938,158.125 91,157.8594 Q90.4063,157.5781 89.7813,157.5781 Q88.4375,157.5781 87.75,158.6563 Q87.0625,159.7188 87.0625,161.8125 Q87.0625,163.9063 87.75,164.9844 Q88.4375,166.0469 89.7813,166.0469 Q90.4063,166.0469 91,165.7813 Q91.5938,165.5 92.2188,164.9219 L92.2188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.75" y="166.1543">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="151.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="184"/>
       <ellipse cx="60.5" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L33" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L33" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="69.5" y="192.2104">e : E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="196.8047"/>
       <ellipse cx="60.5" cy="201.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L34" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L34" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="69.5" y="205.0151">f : F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="209.6094"/>
       <ellipse cx="60.5" cy="214.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L35" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="69.5" y="217.8198">g : detail::G *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="151.5" y1="224.4141" y2="224.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L38" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L38" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="309"/>
       <ellipse cx="171" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,330.6406 Q173.3906,330.9375 172.75,331.0781 Q172.1094,331.2344 171.4063,331.2344 Q168.9063,331.2344 167.5781,329.5938 Q166.2656,327.9375 166.2656,324.8125 Q166.2656,321.6875 167.5781,320.0313 Q168.9063,318.375 171.4063,318.375 Q172.1094,318.375 172.75,318.5313 Q173.4063,318.6875 173.9688,318.9844 L173.9688,321.7031 Q173.3438,321.125 172.75,320.8594 Q172.1563,320.5781 171.5313,320.5781 Q170.1875,320.5781 169.5,321.6563 Q168.8125,322.7188 168.8125,324.8125 Q168.8125,326.9063 169.5,327.9844 Q170.1875,329.0469 171.5313,329.0469 Q172.1563,329.0469 172.75,328.7813 Q173.3438,328.5 173.9688,327.9219 L173.9688,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="329.1543">RRR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="341" y2="341"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="349" y2="349"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L42" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="286" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L42" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="286" y="14.5"/>
       <ellipse cx="301" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M303.9688,36.1406 Q303.3906,36.4375 302.75,36.5781 Q302.1094,36.7344 301.4063,36.7344 Q298.9063,36.7344 297.5781,35.0938 Q296.2656,33.4375 296.2656,30.3125 Q296.2656,27.1875 297.5781,25.5313 Q298.9063,23.875 301.4063,23.875 Q302.1094,23.875 302.75,24.0313 Q303.4063,24.1875 303.9688,24.4844 L303.9688,27.2031 Q303.3438,26.625 302.75,26.3594 Q302.1563,26.0781 301.5313,26.0781 Q300.1875,26.0781 299.5,27.1563 Q298.8125,28.2188 298.8125,30.3125 Q298.8125,32.4063 299.5,33.4844 Q300.1875,34.5469 301.5313,34.5469 Q302.1563,34.5469 302.75,34.2813 Q303.3438,34 303.9688,33.4219 L303.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="315" y="34.6543">ns1::N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="357" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="287" x2="357" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L45" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L45" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="212.5" y="165"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L45" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L45" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="212.5" y="165"/>
       <ellipse cx="227.5" cy="181" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M230.4688,186.6406 Q229.8906,186.9375 229.25,187.0781 Q228.6094,187.2344 227.9063,187.2344 Q225.4063,187.2344 224.0781,185.5938 Q222.7656,183.9375 222.7656,180.8125 Q222.7656,177.6875 224.0781,176.0313 Q225.4063,174.375 227.9063,174.375 Q228.6094,174.375 229.25,174.5313 Q229.9063,174.6875 230.4688,174.9844 L230.4688,177.7031 Q229.8438,177.125 229.25,176.8594 Q228.6563,176.5781 228.0313,176.5781 Q226.6875,176.5781 226,177.6563 Q225.3125,178.7188 225.3125,180.8125 Q225.3125,182.9063 226,183.9844 Q226.6875,185.0469 228.0313,185.0469 Q228.6563,185.0469 229.25,184.7813 Q229.8438,184.5 230.4688,183.9219 L230.4688,186.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="241.5" y="185.1543">ns1::NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213.5" x2="292.5" y1="197" y2="197"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="213.5" x2="292.5" y1="205" y2="205"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L48" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00041/t00041.cc#L48" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pzqnhyncheix)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="329" y="165"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L48" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00041/t00041.cc#L48" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fgr4lv79l0wmo)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="329" y="165"/>
       <ellipse cx="344" cy="181" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M346.9688,186.6406 Q346.3906,186.9375 345.75,187.0781 Q345.1094,187.2344 344.4063,187.2344 Q341.9063,187.2344 340.5781,185.5938 Q339.2656,183.9375 339.2656,180.8125 Q339.2656,177.6875 340.5781,176.0313 Q341.9063,174.375 344.4063,174.375 Q345.1094,174.375 345.75,174.5313 Q346.4063,174.6875 346.9688,174.9844 L346.9688,177.7031 Q346.3438,177.125 345.75,176.8594 Q345.1563,176.5781 344.5313,176.5781 Q343.1875,176.5781 342.5,177.6563 Q341.8125,178.7188 341.8125,180.8125 Q341.8125,182.9063 342.5,183.9844 Q343.1875,185.0469 344.5313,185.0469 Q345.1563,185.0469 345.75,184.7813 Q346.3438,184.5 346.9688,183.9219 L346.9688,186.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="358" y="185.1543">ns1::NM</text>
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index dfdb501a..48be1c8c 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="213px" preserveAspectRatio="none" style="width:489px;height:213px;" version="1.1" viewBox="0 0 489 213" width="489px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fdbzepg2bxc4r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fd7vki3pyv614" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fd7vki3pyv614)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="137" y="135.5"/>
       <ellipse cx="152.45" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.4188,157.1406 Q154.8406,157.4375 154.2,157.5781 Q153.5594,157.7344 152.8563,157.7344 Q150.3563,157.7344 149.0281,156.0938 Q147.7156,154.4375 147.7156,151.3125 Q147.7156,148.1875 149.0281,146.5313 Q150.3563,144.875 152.8563,144.875 Q153.5594,144.875 154.2,145.0313 Q154.8563,145.1875 155.4188,145.4844 L155.4188,148.2031 Q154.7938,147.625 154.2,147.3594 Q153.6063,147.0781 152.9813,147.0781 Q151.6375,147.0781 150.95,148.1563 Q150.2625,149.2188 150.2625,151.3125 Q150.2625,153.4063 150.95,154.4844 Q151.6375,155.5469 152.9813,155.5469 Q153.6063,155.5469 154.2,155.2813 Q154.7938,155 155.4188,154.4219 L155.4188,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.55" y="155.6543">A</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="184" y="144.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="167.5" y2="167.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="143" y="173.5"/>
       <ellipse cx="148" cy="178.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="157" y="181.7104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="138" x2="188" y1="188.3047" y2="188.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fd7vki3pyv614)" height="60.8047" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="6" y="8"/>
       <ellipse cx="25.05" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.0188,29.6406 Q27.4406,29.9375 26.8,30.0781 Q26.1594,30.2344 25.4563,30.2344 Q22.9563,30.2344 21.6281,28.5938 Q20.3156,26.9375 20.3156,23.8125 Q20.3156,20.6875 21.6281,19.0313 Q22.9563,17.375 25.4563,17.375 Q26.1594,17.375 26.8,17.5313 Q27.4563,17.6875 28.0188,17.9844 L28.0188,20.7031 Q27.3938,20.125 26.8,19.8594 Q26.2063,19.5781 25.5813,19.5781 Q24.2375,19.5781 23.55,20.6563 Q22.8625,21.7188 22.8625,23.8125 Q22.8625,25.9063 23.55,26.9844 Q24.2375,28.0469 25.5813,28.0469 Q26.2063,28.0469 26.8,27.7813 Q27.3938,27.5 28.0188,26.9219 L28.0188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.95" y="28.1543">A</text>
@@ -35,16 +35,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="61" y="17.1387">void</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L10" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L10" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="26" y="54.2104">a : void *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="83" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fd7vki3pyv614)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="397.5" y="129"/>
       <ellipse cx="412.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M415.4688,150.6406 Q414.8906,150.9375 414.25,151.0781 Q413.6094,151.2344 412.9063,151.2344 Q410.4063,151.2344 409.0781,149.5938 Q407.7656,147.9375 407.7656,144.8125 Q407.7656,141.6875 409.0781,140.0313 Q410.4063,138.375 412.9063,138.375 Q413.6094,138.375 414.25,138.5313 Q414.9063,138.6875 415.4688,138.9844 L415.4688,141.7031 Q414.8438,141.125 414.25,140.8594 Q413.6563,140.5781 413.0313,140.5781 Q411.6875,140.5781 411,141.6563 Q410.3125,142.7188 410.3125,144.8125 Q410.3125,146.9063 411,147.9844 Q411.6875,149.0469 413.0313,149.0469 Q413.6563,149.0469 414.25,148.7813 Q414.8438,148.5 415.4688,147.9219 L415.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="426.5" y="149.1543">B</text>
@@ -52,22 +52,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="443.5" y="138.1387">T,K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="167"/>
       <ellipse cx="408.5" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="417.5" y="175.2104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="403.5" y="179.8047"/>
       <ellipse cx="408.5" cy="184.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="417.5" y="188.0151">bb : K</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="398.5" x2="459.5" y1="194.6094" y2="194.6094"/>
-    <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
+    <rect fill="#FEFECE" filter="url(#fd7vki3pyv614)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="119.5" y="14.5"/>
     <ellipse cx="134.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M137.4688,36.1406 Q136.8906,36.4375 136.25,36.5781 Q135.6094,36.7344 134.9063,36.7344 Q132.4063,36.7344 131.0781,35.0938 Q129.7656,33.4375 129.7656,30.3125 Q129.7656,27.1875 131.0781,25.5313 Q132.4063,23.875 134.9063,23.875 Q135.6094,23.875 136.25,24.0313 Q136.9063,24.1875 137.4688,24.4844 L137.4688,27.2031 Q136.8438,26.625 136.25,26.3594 Q135.6563,26.0781 135.0313,26.0781 Q133.6875,26.0781 133,27.1563 Q132.3125,28.2188 132.3125,30.3125 Q132.3125,32.4063 133,33.4844 Q133.6875,34.5469 135.0313,34.5469 Q135.6563,34.5469 136.25,34.2813 Q136.8438,34 137.4688,33.4219 L137.4688,36.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="148.5" y="34.6543">A</text>
@@ -75,7 +75,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="165.5" y="23.6387">double</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="46.5" y2="46.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="120.5" x2="205.5" y1="54.5" y2="54.5"/>
-    <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
+    <rect fill="#FEFECE" filter="url(#fd7vki3pyv614)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="242" y="14.5"/>
     <ellipse cx="257" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M259.9688,36.1406 Q259.3906,36.4375 258.75,36.5781 Q258.1094,36.7344 257.4063,36.7344 Q254.9063,36.7344 253.5781,35.0938 Q252.2656,33.4375 252.2656,30.3125 Q252.2656,27.1875 253.5781,25.5313 Q254.9063,23.875 257.4063,23.875 Q258.1094,23.875 258.75,24.0313 Q259.4063,24.1875 259.9688,24.4844 L259.9688,27.2031 Q259.3438,26.625 258.75,26.3594 Q258.1563,26.0781 257.5313,26.0781 Q256.1875,26.0781 255.5,27.1563 Q254.8125,28.2188 254.8125,30.3125 Q254.8125,32.4063 255.5,33.4844 Q256.1875,34.5469 257.5313,34.5469 Q258.1563,34.5469 258.75,34.2813 Q259.3438,34 259.9688,33.4219 L259.9688,36.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="34.6543">A</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="288" y="23.6387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="46.5" y2="46.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="347" y1="54.5" y2="54.5"/>
-    <rect fill="#FEFECE" filter="url(#fdbzepg2bxc4r)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
+    <rect fill="#FEFECE" filter="url(#fd7vki3pyv614)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="383" y="14.5"/>
     <ellipse cx="398" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M400.9688,36.1406 Q400.3906,36.4375 399.75,36.5781 Q399.1094,36.7344 398.4063,36.7344 Q395.9063,36.7344 394.5781,35.0938 Q393.2656,33.4375 393.2656,30.3125 Q393.2656,27.1875 394.5781,25.5313 Q395.9063,23.875 398.4063,23.875 Q399.1094,23.875 399.75,24.0313 Q400.4063,24.1875 400.9688,24.4844 L400.9688,27.2031 Q400.3438,26.625 399.75,26.3594 Q399.1563,26.0781 398.5313,26.0781 Q397.1875,26.0781 396.5,27.1563 Q395.8125,28.2188 395.8125,30.3125 Q395.8125,32.4063 396.5,33.4844 Q397.1875,34.5469 398.5313,34.5469 Q399.1563,34.5469 399.75,34.2813 Q400.3438,34 400.9688,33.4219 L400.9688,36.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="412" y="34.6543">B</text>
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 7d93b5d0..b928493e 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:749px;height:645px;" version="1.1" viewBox="0 0 749 645" width="749px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ee000erqki9x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12ebkbhdotueq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1ee000erqki9x)" points="22,24,122,24,129,46.2969,455,46.2969,455,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f12ebkbhdotueq)" points="22,24,122,24,129,46.2969,455,46.2969,455,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1ee000erqki9x)" points="479,24,597,24,604,46.2969,727,46.2969,727,518.5,479,518.5,479,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f12ebkbhdotueq)" points="479,24,597,24,604,46.2969,727,46.2969,727,518.5,479,518.5,479,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="479" x2="604" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="483" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="220" y="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="220" y="569"/>
       <ellipse cx="235" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M237.9688,590.6406 Q237.3906,590.9375 236.75,591.0781 Q236.1094,591.2344 235.4063,591.2344 Q232.9063,591.2344 231.5781,589.5938 Q230.2656,587.9375 230.2656,584.8125 Q230.2656,581.6875 231.5781,580.0313 Q232.9063,578.375 235.4063,578.375 Q236.1094,578.375 236.75,578.5313 Q237.4063,578.6875 237.9688,578.9844 L237.9688,581.7031 Q237.3438,581.125 236.75,580.8594 Q236.1563,580.5781 235.5313,580.5781 Q234.1875,580.5781 233.5,581.6563 Q232.8125,582.7188 232.8125,584.8125 Q232.8125,586.9063 233.5,587.9844 Q234.1875,589.0469 235.5313,589.0469 Q236.1563,589.0469 236.75,588.7813 Q237.3438,588.5 237.9688,587.9219 L237.9688,590.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="249" y="589.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="259" y1="601" y2="601"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="259" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="259.5" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="259.5" y="448"/>
       <ellipse cx="340.75" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M343.7188,469.6406 Q343.1406,469.9375 342.5,470.0781 Q341.8594,470.2344 341.1563,470.2344 Q338.6563,470.2344 337.3281,468.5938 Q336.0156,466.9375 336.0156,463.8125 Q336.0156,460.6875 337.3281,459.0313 Q338.6563,457.375 341.1563,457.375 Q341.8594,457.375 342.5,457.5313 Q343.1563,457.6875 343.7188,457.9844 L343.7188,460.7031 Q343.0938,460.125 342.5,459.8594 Q341.9063,459.5781 341.2813,459.5781 Q339.9375,459.5781 339.25,460.6563 Q338.5625,461.7188 338.5625,463.8125 Q338.5625,465.9063 339.25,466.9844 Q339.9375,468.0469 341.2813,468.0469 Q341.9063,468.0469 342.5,467.7813 Q343.0938,467.5 343.7188,466.9219 L343.7188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="361.25" y="468.1543">B</text>
@@ -33,8 +33,8 @@
       <ellipse cx="270.5" cy="499" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="279.5" y="502.2104">b(dependants::A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="38" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="38" y="448"/>
       <ellipse cx="118.75" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M121.7188,469.6406 Q121.1406,469.9375 120.5,470.0781 Q119.8594,470.2344 119.1563,470.2344 Q116.6563,470.2344 115.3281,468.5938 Q114.0156,466.9375 114.0156,463.8125 Q114.0156,460.6875 115.3281,459.0313 Q116.6563,457.375 119.1563,457.375 Q119.8594,457.375 120.5,457.5313 Q121.1563,457.6875 121.7188,457.9844 L121.7188,460.7031 Q121.0938,460.125 120.5,459.8594 Q119.9063,459.5781 119.2813,459.5781 Q117.9375,459.5781 117.25,460.6563 Q116.5625,461.7188 116.5625,463.8125 Q116.5625,465.9063 117.25,466.9844 Q117.9375,468.0469 119.2813,468.0469 Q119.9063,468.0469 120.5,467.7813 Q121.0938,467.5 121.7188,466.9219 L121.7188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="139.25" y="468.1543">BB</text>
@@ -43,8 +43,8 @@
       <ellipse cx="49" cy="499" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="58" y="502.2104">bb(dependants::A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="236.5" y="320.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="236.5" y="320.5"/>
       <ellipse cx="317.75" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M320.7188,342.1406 Q320.1406,342.4375 319.5,342.5781 Q318.8594,342.7344 318.1563,342.7344 Q315.6563,342.7344 314.3281,341.0938 Q313.0156,339.4375 313.0156,336.3125 Q313.0156,333.1875 314.3281,331.5313 Q315.6563,329.875 318.1563,329.875 Q318.8594,329.875 319.5,330.0313 Q320.1563,330.1875 320.7188,330.4844 L320.7188,333.2031 Q320.0938,332.625 319.5,332.3594 Q318.9063,332.0781 318.2813,332.0781 Q316.9375,332.0781 316.25,333.1563 Q315.5625,334.2188 315.5625,336.3125 Q315.5625,338.4063 316.25,339.4844 Q316.9375,340.5469 318.2813,340.5469 Q318.9063,340.5469 319.5,340.2813 Q320.0938,340 320.7188,339.4219 L320.7188,342.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338.25" y="340.6543">C</text>
@@ -53,8 +53,8 @@
       <ellipse cx="247.5" cy="371.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="256.5" y="374.7104">c(dependants::B * b) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="202" x="97" y="180"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="202" x="97" y="180"/>
       <ellipse cx="189.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.2188,201.6406 Q191.6406,201.9375 191,202.0781 Q190.3594,202.2344 189.6563,202.2344 Q187.1563,202.2344 185.8281,200.5938 Q184.5156,198.9375 184.5156,195.8125 Q184.5156,192.6875 185.8281,191.0313 Q187.1563,189.375 189.6563,189.375 Q190.3594,189.375 191,189.5313 Q191.6563,189.6875 192.2188,189.9844 L192.2188,192.7031 Q191.5938,192.125 191,191.8594 Q190.4063,191.5781 189.7813,191.5781 Q188.4375,191.5781 187.75,192.6563 Q187.0625,193.7188 187.0625,195.8125 Q187.0625,197.9063 187.75,198.9844 Q188.4375,200.0469 189.7813,200.0469 Q190.4063,200.0469 191,199.7813 Q191.5938,199.5 192.2188,198.9219 L192.2188,201.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.75" y="200.1543">D</text>
@@ -65,8 +65,8 @@
       <ellipse cx="108" cy="243.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="117" y="247.0151">dd(dependants::BB * bb) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L24" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="180" x="108" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L24" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L24" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="180" x="108" y="59"/>
       <ellipse cx="189.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.7188,80.6406 Q192.1406,80.9375 191.5,81.0781 Q190.8594,81.2344 190.1563,81.2344 Q187.6563,81.2344 186.3281,79.5938 Q185.0156,77.9375 185.0156,74.8125 Q185.0156,71.6875 186.3281,70.0313 Q187.6563,68.375 190.1563,68.375 Q190.8594,68.375 191.5,68.5313 Q192.1563,68.6875 192.7188,68.9844 L192.7188,71.7031 Q192.0938,71.125 191.5,70.8594 Q190.9063,70.5781 190.2813,70.5781 Q188.9375,70.5781 188.25,71.6563 Q187.5625,72.7188 187.5625,74.8125 Q187.5625,76.9063 188.25,77.9844 Q188.9375,79.0469 190.2813,79.0469 Q190.9063,79.0469 191.5,78.7813 Q192.0938,78.5 192.7188,77.9219 L192.7188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="210.25" y="79.1543">E</text>
@@ -75,24 +75,24 @@
       <ellipse cx="119" cy="110" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="128" y="113.2104">e(dependants::D * d) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="541.5" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L34" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="541.5" y="454.5"/>
       <ellipse cx="556.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M559.4688,476.1406 Q558.8906,476.4375 558.25,476.5781 Q557.6094,476.7344 556.9063,476.7344 Q554.4063,476.7344 553.0781,475.0938 Q551.7656,473.4375 551.7656,470.3125 Q551.7656,467.1875 553.0781,465.5313 Q554.4063,463.875 556.9063,463.875 Q557.6094,463.875 558.25,464.0313 Q558.9063,464.1875 559.4688,464.4844 L559.4688,467.2031 Q558.8438,466.625 558.25,466.3594 Q557.6563,466.0781 557.0313,466.0781 Q555.6875,466.0781 555,467.1563 Q554.3125,468.2188 554.3125,470.3125 Q554.3125,472.4063 555,473.4844 Q555.6875,474.5469 557.0313,474.5469 Q557.6563,474.5469 558.25,474.2813 Q558.8438,474 559.4688,473.4219 L559.4688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="570.5" y="474.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="542.5" x2="581.5" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="542.5" x2="581.5" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L37" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="618" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L37" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L37" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="618" y="454.5"/>
       <ellipse cx="633" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M635.9688,476.1406 Q635.3906,476.4375 634.75,476.5781 Q634.1094,476.7344 633.4063,476.7344 Q630.9063,476.7344 629.5781,475.0938 Q628.2656,473.4375 628.2656,470.3125 Q628.2656,467.1875 629.5781,465.5313 Q630.9063,463.875 633.4063,463.875 Q634.1094,463.875 634.75,464.0313 Q635.4063,464.1875 635.9688,464.4844 L635.9688,467.2031 Q635.3438,466.625 634.75,466.3594 Q634.1563,466.0781 633.5313,466.0781 Q632.1875,466.0781 631.5,467.1563 Q630.8125,468.2188 630.8125,470.3125 Q630.8125,472.4063 631.5,473.4844 Q632.1875,474.5469 633.5313,474.5469 Q634.1563,474.5469 634.75,474.2813 Q635.3438,474 635.9688,473.4219 L635.9688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="647" y="474.6543">GG</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="619" x2="667" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="619" x2="667" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L40" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L40" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="495" y="314"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L40" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L40" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="495" y="314"/>
       <ellipse cx="594.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.2188,335.6406 Q596.6406,335.9375 596,336.0781 Q595.3594,336.2344 594.6563,336.2344 Q592.1563,336.2344 590.8281,334.5938 Q589.5156,332.9375 589.5156,329.8125 Q589.5156,326.6875 590.8281,325.0313 Q592.1563,323.375 594.6563,323.375 Q595.3594,323.375 596,323.5313 Q596.6563,323.6875 597.2188,323.9844 L597.2188,326.7031 Q596.5938,326.125 596,325.8594 Q595.4063,325.5781 594.7813,325.5781 Q593.4375,325.5781 592.75,326.6563 Q592.0625,327.7188 592.0625,329.8125 Q592.0625,331.9063 592.75,332.9844 Q593.4375,334.0469 594.7813,334.0469 Q595.4063,334.0469 596,333.7813 Q596.5938,333.5 597.2188,332.9219 L597.2188,335.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="614.75" y="334.1543">H</text>
@@ -103,8 +103,8 @@
       <ellipse cx="506" cy="377.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="515" y="381.0151">hh(dependencies::GG * gg) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L49" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="509" y="186.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L49" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="509" y="186.5"/>
       <ellipse cx="597.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M600.2188,208.1406 Q599.6406,208.4375 599,208.5781 Q598.3594,208.7344 597.6563,208.7344 Q595.1563,208.7344 593.8281,207.0938 Q592.5156,205.4375 592.5156,202.3125 Q592.5156,199.1875 593.8281,197.5313 Q595.1563,195.875 597.6563,195.875 Q598.3594,195.875 599,196.0313 Q599.6563,196.1875 600.2188,196.4844 L600.2188,199.2031 Q599.5938,198.625 599,198.3594 Q598.4063,198.0781 597.7813,198.0781 Q596.4375,198.0781 595.75,199.1563 Q595.0625,200.2188 595.0625,202.3125 Q595.0625,204.4063 595.75,205.4844 Q596.4375,206.5469 597.7813,206.5469 Q598.4063,206.5469 599,206.2813 Q599.5938,206 600.2188,205.4219 L600.2188,208.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="617.75" y="206.6543">I</text>
@@ -113,8 +113,8 @@
       <ellipse cx="520" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="529" y="240.7104">i(dependencies::H * h) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L53" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00043/t00043.cc#L53" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ee000erqki9x)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="513.5" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L53" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00043/t00043.cc#L53" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12ebkbhdotueq)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="513.5" y="59"/>
       <ellipse cx="597.25" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M600.2188,80.6406 Q599.6406,80.9375 599,81.0781 Q598.3594,81.2344 597.6563,81.2344 Q595.1563,81.2344 593.8281,79.5938 Q592.5156,77.9375 592.5156,74.8125 Q592.5156,71.6875 593.8281,70.0313 Q595.1563,68.375 597.6563,68.375 Q598.3594,68.375 599,68.5313 Q599.6563,68.6875 600.2188,68.9844 L600.2188,71.7031 Q599.5938,71.125 599,70.8594 Q598.4063,70.5781 597.7813,70.5781 Q596.4375,70.5781 595.75,71.6563 Q595.0625,72.7188 595.0625,74.8125 Q595.0625,76.9063 595.75,77.9844 Q596.4375,79.0469 597.7813,79.0469 Q598.4063,79.0469 599,78.7813 Q599.5938,78.5 600.2188,77.9219 L600.2188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="617.75" y="79.1543">J</text>
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index 94d5d9c0..a17b1c48 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="327px" preserveAspectRatio="none" style="width:2532px;height:327px;" version="1.1" viewBox="0 0 2532 327" width="2532px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzc54eofmh09e" width="300%" x="-1" y="-1">
+    <filter height="300%" id="ffwzfjb5p1pcu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,7 +9,7 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001821770251018637091" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="1422" y="159"/>
+    <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="48" id="C_0001821770251018637091" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="1422" y="159"/>
     <ellipse cx="1437" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1439.9688,180.6406 Q1439.3906,180.9375 1438.75,181.0781 Q1438.1094,181.2344 1437.4063,181.2344 Q1434.9063,181.2344 1433.5781,179.5938 Q1432.2656,177.9375 1432.2656,174.8125 Q1432.2656,171.6875 1433.5781,170.0313 Q1434.9063,168.375 1437.4063,168.375 Q1438.1094,168.375 1438.75,168.5313 Q1439.4063,168.6875 1439.9688,168.9844 L1439.9688,171.7031 Q1439.3438,171.125 1438.75,170.8594 Q1438.1563,170.5781 1437.5313,170.5781 Q1436.1875,170.5781 1435.5,171.6563 Q1434.8125,172.7188 1434.8125,174.8125 Q1434.8125,176.9063 1435.5,177.9844 Q1436.1875,179.0469 1437.5313,179.0469 Q1438.1563,179.0469 1438.75,178.7813 Q1439.3438,178.5 1439.9688,177.9219 L1439.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="1451" y="179.1543">signal_handler</text>
@@ -17,8 +17,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="12" x="1551" y="168.1387">,A</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1423" x2="1560" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1423" x2="1560" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="73.6094" id="C_0000427079823582703514" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="73.6094" id="C_0000427079823582703514" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="6" y="8"/>
       <ellipse cx="569.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M572.7188,29.6406 Q572.1406,29.9375 571.5,30.0781 Q570.8594,30.2344 570.1563,30.2344 Q567.6563,30.2344 566.3281,28.5938 Q565.0156,26.9375 565.0156,23.8125 Q565.0156,20.6875 566.3281,19.0313 Q567.6563,17.375 570.1563,17.375 Q570.8594,17.375 571.5,17.5313 Q572.1563,17.6875 572.7188,17.9844 L572.7188,20.7031 Q572.0938,20.125 571.5,19.8594 Q570.9063,19.5781 570.2813,19.5781 Q568.9375,19.5781 568.25,20.6563 Q567.5625,21.7188 567.5625,23.8125 Q567.5625,25.9063 568.25,26.9844 Q568.9375,28.0469 570.2813,28.0469 Q570.9063,28.0469 571.5,27.7813 Q572.0938,27.5 572.7188,26.9219 L572.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="590.25" y="28.1543">sink</text>
@@ -27,15 +27,15 @@
       <ellipse cx="17" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="1135" x="26" y="62.2104">sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...), type-parameter-0-2&gt; &gt;(sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t &amp; sh) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="66.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="608" x="26" y="75.0151">signal : sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="73.6094" id="C_0001813783008369291713" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="1202" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="73.6094" id="C_0001813783008369291713" style="stroke: #A80036; stroke-width: 1.5;" width="1161" x="1202" y="8"/>
       <ellipse cx="1587.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1590.2188,29.6406 Q1589.6406,29.9375 1589,30.0781 Q1588.3594,30.2344 1587.6563,30.2344 Q1585.1563,30.2344 1583.8281,28.5938 Q1582.5156,26.9375 1582.5156,23.8125 Q1582.5156,20.6875 1583.8281,19.0313 Q1585.1563,17.375 1587.6563,17.375 Q1588.3594,17.375 1589,17.5313 Q1589.6563,17.6875 1590.2188,17.9844 L1590.2188,20.7031 Q1589.5938,20.125 1589,19.8594 Q1588.4063,19.5781 1587.7813,19.5781 Q1586.4375,19.5781 1585.75,20.6563 Q1585.0625,21.7188 1585.0625,23.8125 Q1585.0625,25.9063 1585.75,26.9844 Q1586.4375,28.0469 1587.7813,28.0469 Q1588.4063,28.0469 1589,27.7813 Q1589.5938,27.5 1590.2188,26.9219 L1590.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="1607.75" y="28.1543">sink</text>
@@ -46,23 +46,23 @@
       <ellipse cx="1213" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="1135" x="1222" y="62.2104">sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...), type-parameter-0-2&gt; &gt;(sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t &amp; sh) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1208" y="66.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1210" y="68.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" target="_top" title="signal" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L20" xlink:show="new" xlink:title="signal" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="608" x="1222" y="75.0151">signal : sink&lt;signal_handler&lt;type-parameter-0-0 (type-parameter-0-1...),type-parameter-0-2&gt;&gt;::signal_t *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001971467667171416814" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="2398" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="48" id="C_0001971467667171416814" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="2398" y="21"/>
       <ellipse cx="2413" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2415.9688,42.6406 Q2415.3906,42.9375 2414.75,43.0781 Q2414.1094,43.2344 2413.4063,43.2344 Q2410.9063,43.2344 2409.5781,41.5938 Q2408.2656,39.9375 2408.2656,36.8125 Q2408.2656,33.6875 2409.5781,32.0313 Q2410.9063,30.375 2413.4063,30.375 Q2414.1094,30.375 2414.75,30.5313 Q2415.4063,30.6875 2415.9688,30.9844 L2415.9688,33.7031 Q2415.3438,33.125 2414.75,32.8594 Q2414.1563,32.5781 2413.5313,32.5781 Q2412.1875,32.5781 2411.5,33.6563 Q2410.8125,34.7188 2410.8125,36.8125 Q2410.8125,38.9063 2411.5,39.9844 Q2412.1875,41.0469 2413.5313,41.0469 Q2414.1563,41.0469 2414.75,40.7813 Q2415.3438,40.5 2415.9688,39.9219 L2415.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="2427" y="41.1543">signal_handler</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2399" x2="2520" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2399" x2="2520" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1178" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="1178" y="159"/>
       <ellipse cx="1193" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1195.9688,180.6406 Q1195.3906,180.9375 1194.75,181.0781 Q1194.1094,181.2344 1193.4063,181.2344 Q1190.9063,181.2344 1189.5781,179.5938 Q1188.2656,177.9375 1188.2656,174.8125 Q1188.2656,171.6875 1189.5781,170.0313 Q1190.9063,168.375 1193.4063,168.375 Q1194.1094,168.375 1194.75,168.5313 Q1195.4063,168.6875 1195.9688,168.9844 L1195.9688,171.7031 Q1195.3438,171.125 1194.75,170.8594 Q1194.1563,170.5781 1193.5313,170.5781 Q1192.1875,170.5781 1191.5,171.6563 Q1190.8125,172.7188 1190.8125,174.8125 Q1190.8125,176.9063 1191.5,177.9844 Q1192.1875,179.0469 1193.5313,179.0469 Q1194.1563,179.0469 1194.75,178.7813 Q1195.3438,178.5 1195.9688,177.9219 L1195.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="1207" y="179.1543">signal_handler</text>
@@ -71,8 +71,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1179" x2="1386" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1179" x2="1386" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L7" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L7" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1229.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L7" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L7" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="1229.5" y="268"/>
       <ellipse cx="1244.5" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1247.4688,289.6406 Q1246.8906,289.9375 1246.25,290.0781 Q1245.6094,290.2344 1244.9063,290.2344 Q1242.4063,290.2344 1241.0781,288.5938 Q1239.7656,286.9375 1239.7656,283.8125 Q1239.7656,280.6875 1241.0781,279.0313 Q1242.4063,277.375 1244.9063,277.375 Q1245.6094,277.375 1246.25,277.5313 Q1246.9063,277.6875 1247.4688,277.9844 L1247.4688,280.7031 Q1246.8438,280.125 1246.25,279.8594 Q1245.6563,279.5781 1245.0313,279.5781 Q1243.6875,279.5781 1243,280.6563 Q1242.3125,281.7188 1242.3125,283.8125 Q1242.3125,285.9063 1243,286.9844 Q1243.6875,288.0469 1245.0313,288.0469 Q1245.6563,288.0469 1246.25,287.7813 Q1246.8438,287.5 1247.4688,286.9219 L1247.4688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="1258.5" y="288.1543">signal_handler</text>
@@ -81,8 +81,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1230.5" x2="1374.5" y1="300" y2="300"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1230.5" x2="1374.5" y1="308" y2="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L5" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00044/t00044.cc#L5" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzc54eofmh09e)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="1748.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L5" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00044/t00044.cc#L5" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#ffwzfjb5p1pcu)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="1748.5" y="159"/>
       <ellipse cx="1763.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1766.4688,180.6406 Q1765.8906,180.9375 1765.25,181.0781 Q1764.6094,181.2344 1763.9063,181.2344 Q1761.4063,181.2344 1760.0781,179.5938 Q1758.7656,177.9375 1758.7656,174.8125 Q1758.7656,171.6875 1760.0781,170.0313 Q1761.4063,168.375 1763.9063,168.375 Q1764.6094,168.375 1765.25,168.5313 Q1765.9063,168.6875 1766.4688,168.9844 L1766.4688,171.7031 Q1765.8438,171.125 1765.25,170.8594 Q1764.6563,170.5781 1764.0313,170.5781 Q1762.6875,170.5781 1762,171.6563 Q1761.3125,172.7188 1761.3125,174.8125 Q1761.3125,176.9063 1762,177.9844 Q1762.6875,179.0469 1764.0313,179.0469 Q1764.6563,179.0469 1765.25,178.7813 Q1765.8438,178.5 1766.4688,177.9219 L1766.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="1777.5" y="179.1543">sink</text>
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index 89f15c3d..911fd97f 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bso9u27ude8w" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f11jaf1qdmqlzv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,32 +9,32 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
       <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
       <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L7" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L7" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
       <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L10" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L10" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L10" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L10" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
       <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
@@ -42,103 +42,103 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="464.5" y="42.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="71.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L11" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L11" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="79.7104">t : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="86.3047" y2="86.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L16" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L16" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L16" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L16" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
       <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
       <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
       <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
       <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L30" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L30" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L30" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L30" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
       <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
       <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L36" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L36" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
       <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L39" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L39" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bso9u27ude8w)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L39" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L39" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11jaf1qdmqlzv)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
       <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
       <ellipse cx="196" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L41" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L41" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="205" y="54.2104">a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="58.8047"/>
       <ellipse cx="196" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L42" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L42" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="67.0151">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="71.6094"/>
       <ellipse cx="196" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L43" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L43" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="79.8198">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="84.4141"/>
       <ellipse cx="196" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L44" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00045/t00045.cc#L44" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="92.6245">root_a : ::A *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index f3548188..4c511f62 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="619px" preserveAspectRatio="none" style="width:684px;height:619px;" version="1.1" viewBox="0 0 684 619" width="684px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzk68rc5wvltj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1h1e9nn1m475t" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,118 +9,118 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fzk68rc5wvltj)" points="120,24.5,155,24.5,162,46.7969,534,46.7969,534,607,120,607,120,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1h1e9nn1m475t)" points="120,24.5,155,24.5,162,46.7969,534,46.7969,534,607,120,607,120,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="120" x2="162" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="124" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#fzk68rc5wvltj)" points="144,173,179,173,186,195.2969,510,195.2969,510,583,144,583,144,173" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1h1e9nn1m475t)" points="144,173,179,173,186,195.2969,510,195.2969,510,583,144,583,144,173" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="144" x2="186" y1="195.2969" y2="195.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="148" y="187.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#fzk68rc5wvltj)" points="6,57,90,57,97,79.2969,104,79.2969,104,109.5938,6,109.5938,6,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1h1e9nn1m475t)" points="6,57,90,57,97,79.2969,104,79.2969,104,109.5938,6,109.5938,6,57" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="97" y1="79.2969" y2="79.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="78" x="10" y="71.9951">__gnu_cxx</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="206" y="59.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L12" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L12" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="206" y="59.5"/>
       <ellipse cx="221" cy="75.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.9688,81.1406 Q223.3906,81.4375 222.75,81.5781 Q222.1094,81.7344 221.4063,81.7344 Q218.9063,81.7344 217.5781,80.0938 Q216.2656,78.4375 216.2656,75.3125 Q216.2656,72.1875 217.5781,70.5313 Q218.9063,68.875 221.4063,68.875 Q222.1094,68.875 222.75,69.0313 Q223.4063,69.1875 223.9688,69.4844 L223.9688,72.2031 Q223.3438,71.625 222.75,71.3594 Q222.1563,71.0781 221.5313,71.0781 Q220.1875,71.0781 219.5,72.1563 Q218.8125,73.2188 218.8125,75.3125 Q218.8125,77.4063 219.5,78.4844 Q220.1875,79.5469 221.5313,79.5469 Q222.1563,79.5469 222.75,79.2813 Q223.3438,79 223.9688,78.4219 L223.9688,81.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="235" y="79.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="207" x2="245" y1="91.5" y2="91.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="207" x2="245" y1="99.5" y2="99.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="306" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="306" y="410"/>
       <ellipse cx="321" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M323.9688,431.6406 Q323.3906,431.9375 322.75,432.0781 Q322.1094,432.2344 321.4063,432.2344 Q318.9063,432.2344 317.5781,430.5938 Q316.2656,428.9375 316.2656,425.8125 Q316.2656,422.6875 317.5781,421.0313 Q318.9063,419.375 321.4063,419.375 Q322.1094,419.375 322.75,419.5313 Q323.4063,419.6875 323.9688,419.9844 L323.9688,422.7031 Q323.3438,422.125 322.75,421.8594 Q322.1563,421.5781 321.5313,421.5781 Q320.1875,421.5781 319.5,422.6563 Q318.8125,423.7188 318.8125,425.8125 Q318.8125,427.9063 319.5,428.9844 Q320.1875,430.0469 321.5313,430.0469 Q322.1563,430.0469 322.75,429.7813 Q323.3438,429.5 323.9688,428.9219 L323.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="335" y="430.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="307" x2="345" y1="442" y2="442"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="307" x2="345" y1="450" y2="450"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L20" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="276" y="519"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L20" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="276" y="519"/>
       <ellipse cx="291" cy="535" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M293.9688,540.6406 Q293.3906,540.9375 292.75,541.0781 Q292.1094,541.2344 291.4063,541.2344 Q288.9063,541.2344 287.5781,539.5938 Q286.2656,537.9375 286.2656,534.8125 Q286.2656,531.6875 287.5781,530.0313 Q288.9063,528.375 291.4063,528.375 Q292.1094,528.375 292.75,528.5313 Q293.4063,528.6875 293.9688,528.9844 L293.9688,531.7031 Q293.3438,531.125 292.75,530.8594 Q292.1563,530.5781 291.5313,530.5781 Q290.1875,530.5781 289.5,531.6563 Q288.8125,532.7188 288.8125,534.8125 Q288.8125,536.9063 289.5,537.9844 Q290.1875,539.0469 291.5313,539.0469 Q292.1563,539.0469 292.75,538.7813 Q293.3438,538.5 293.9688,537.9219 L293.9688,540.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="305" y="539.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="315" y1="551" y2="551"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="315" y1="559" y2="559"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="160" y="246.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="160" y="246.5"/>
       <ellipse cx="175" cy="262.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M177.9688,268.1406 Q177.3906,268.4375 176.75,268.5781 Q176.1094,268.7344 175.4063,268.7344 Q172.9063,268.7344 171.5781,267.0938 Q170.2656,265.4375 170.2656,262.3125 Q170.2656,259.1875 171.5781,257.5313 Q172.9063,255.875 175.4063,255.875 Q176.1094,255.875 176.75,256.0313 Q177.4063,256.1875 177.9688,256.4844 L177.9688,259.2031 Q177.3438,258.625 176.75,258.3594 Q176.1563,258.0781 175.5313,258.0781 Q174.1875,258.0781 173.5,259.1563 Q172.8125,260.2188 172.8125,262.3125 Q172.8125,264.4063 173.5,265.4844 Q174.1875,266.5469 175.5313,266.5469 Q176.1563,266.5469 176.75,266.2813 Q177.3438,266 177.9688,265.4219 L177.9688,268.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="189" y="266.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="199" y1="278.5" y2="278.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="199" y1="286.5" y2="286.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L26" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="351.5" y="519"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L26" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="351.5" y="519"/>
       <ellipse cx="366.5" cy="535" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M369.4688,540.6406 Q368.8906,540.9375 368.25,541.0781 Q367.6094,541.2344 366.9063,541.2344 Q364.4063,541.2344 363.0781,539.5938 Q361.7656,537.9375 361.7656,534.8125 Q361.7656,531.6875 363.0781,530.0313 Q364.4063,528.375 366.9063,528.375 Q367.6094,528.375 368.25,528.5313 Q368.9063,528.6875 369.4688,528.9844 L369.4688,531.7031 Q368.8438,531.125 368.25,530.8594 Q367.6563,530.5781 367.0313,530.5781 Q365.6875,530.5781 365,531.6563 Q364.3125,532.7188 364.3125,534.8125 Q364.3125,536.9063 365,537.9844 Q365.6875,539.0469 367.0313,539.0469 Q367.6563,539.0469 368.25,538.7813 Q368.8438,538.5 369.4688,537.9219 L369.4688,540.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="380.5" y="539.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352.5" x2="391.5" y1="551" y2="551"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352.5" x2="391.5" y1="559" y2="559"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="454" y="246.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L29" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="454" y="246.5"/>
       <ellipse cx="469" cy="262.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M471.9688,268.1406 Q471.3906,268.4375 470.75,268.5781 Q470.1094,268.7344 469.4063,268.7344 Q466.9063,268.7344 465.5781,267.0938 Q464.2656,265.4375 464.2656,262.3125 Q464.2656,259.1875 465.5781,257.5313 Q466.9063,255.875 469.4063,255.875 Q470.1094,255.875 470.75,256.0313 Q471.4063,256.1875 471.9688,256.4844 L471.9688,259.2031 Q471.3438,258.625 470.75,258.3594 Q470.1563,258.0781 469.5313,258.0781 Q468.1875,258.0781 467.5,259.1563 Q466.8125,260.2188 466.8125,262.3125 Q466.8125,264.4063 467.5,265.4844 Q468.1875,266.5469 469.5313,266.5469 Q470.1563,266.5469 470.75,266.2813 Q471.3438,266 471.9688,265.4219 L471.9688,268.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="483" y="266.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="493" y1="278.5" y2="278.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="493" y1="286.5" y2="286.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="235" y="208"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L32" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L32" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="235" y="208"/>
       <ellipse cx="318.75" cy="224" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M321.7188,229.6406 Q321.1406,229.9375 320.5,230.0781 Q319.8594,230.2344 319.1563,230.2344 Q316.6563,230.2344 315.3281,228.5938 Q314.0156,226.9375 314.0156,223.8125 Q314.0156,220.6875 315.3281,219.0313 Q316.6563,217.375 319.1563,217.375 Q319.8594,217.375 320.5,217.5313 Q321.1563,217.6875 321.7188,217.9844 L321.7188,220.7031 Q321.0938,220.125 320.5,219.8594 Q319.9063,219.5781 319.2813,219.5781 Q317.9375,219.5781 317.25,220.6563 Q316.5625,221.7188 316.5625,223.8125 Q316.5625,225.9063 317.25,226.9844 Q317.9375,228.0469 319.2813,228.0469 Q319.9063,228.0469 320.5,227.7813 Q321.0938,227.5 321.7188,226.9219 L321.7188,229.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339.25" y="228.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="418" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="246"/>
       <ellipse cx="246" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L34" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L34" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="255" y="254.2104">a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="258.8047"/>
       <ellipse cx="246" cy="263.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L35" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L35" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="255" y="267.0151">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="271.6094"/>
       <ellipse cx="246" cy="276.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L36" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L36" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="255" y="279.8198">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="284.4141"/>
       <ellipse cx="246" cy="289.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L37" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L37" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="255" y="292.6245">root_a : ::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="297.2188"/>
       <ellipse cx="246" cy="302.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L38" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L38" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="255" y="305.4292">i : std::vector&lt;std::uint8_t&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="418" y1="312.0234" y2="312.0234"/>
     <ellipse cx="246" cy="323.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="255" y="326.2339">foo(AA &amp; aa) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="633" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="633" y="410"/>
       <ellipse cx="648" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M650.9688,431.6406 Q650.3906,431.9375 649.75,432.0781 Q649.1094,432.2344 648.4063,432.2344 Q645.9063,432.2344 644.5781,430.5938 Q643.2656,428.9375 643.2656,425.8125 Q643.2656,422.6875 644.5781,421.0313 Q645.9063,419.375 648.4063,419.375 Q649.1094,419.375 649.75,419.5313 Q650.4063,419.6875 650.9688,419.9844 L650.9688,422.7031 Q650.3438,422.125 649.75,421.8594 Q649.1563,421.5781 648.5313,421.5781 Q647.1875,421.5781 646.5,422.6563 Q645.8125,423.7188 645.8125,425.8125 Q645.8125,427.9063 646.5,428.9844 Q647.1875,430.0469 648.5313,430.0469 Q649.1563,430.0469 649.75,429.7813 Q650.3438,429.5 650.9688,428.9219 L650.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="662" y="430.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="634" x2="672" y1="442" y2="442"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="634" x2="672" y1="450" y2="450"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L7" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00046/t00046.cc#L7" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzk68rc5wvltj)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="550" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L7" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00046/t00046.cc#L7" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1h1e9nn1m475t)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="550" y="410"/>
       <ellipse cx="565" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M567.9688,431.6406 Q567.3906,431.9375 566.75,432.0781 Q566.1094,432.2344 565.4063,432.2344 Q562.9063,432.2344 561.5781,430.5938 Q560.2656,428.9375 560.2656,425.8125 Q560.2656,422.6875 561.5781,421.0313 Q562.9063,419.375 565.4063,419.375 Q566.1094,419.375 566.75,419.5313 Q567.4063,419.6875 567.9688,419.9844 L567.9688,422.7031 Q567.3438,422.125 566.75,421.8594 Q566.1563,421.5781 565.5313,421.5781 Q564.1875,421.5781 563.5,422.6563 Q562.8125,423.7188 562.8125,425.8125 Q562.8125,427.9063 563.5,428.9844 Q564.1875,430.0469 565.5313,430.0469 Q566.1563,430.0469 566.75,429.7813 Q567.3438,429.5 567.9688,428.9219 L567.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="579" y="430.1543">AA</text>
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index ee9de4c0..5460afe9 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:946px;height:175px;" version="1.1" viewBox="0 0 946 175" width="946px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fekzz09dqtn0u" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f176mde574j5b9" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000780206187563989609" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f176mde574j5b9)" height="48" id="C_0000780206187563989609" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="117" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="117" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="153.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f176mde574j5b9)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="153.5" y="8"/>
       <ellipse cx="168.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M171.4688,29.6406 Q170.8906,29.9375 170.25,30.0781 Q169.6094,30.2344 168.9063,30.2344 Q166.4063,30.2344 165.0781,28.5938 Q163.7656,26.9375 163.7656,23.8125 Q163.7656,20.6875 165.0781,19.0313 Q166.4063,17.375 168.9063,17.375 Q169.6094,17.375 170.25,17.5313 Q170.9063,17.6875 171.4688,17.9844 L171.4688,20.7031 Q170.8438,20.125 170.25,19.8594 Q169.6563,19.5781 169.0313,19.5781 Q167.6875,19.5781 167,20.6563 Q166.3125,21.7188 166.3125,23.8125 Q166.3125,25.9063 167,26.9844 Q167.6875,28.0469 169.0313,28.0469 Q169.6563,28.0469 170.25,27.7813 Q170.8438,27.5 171.4688,26.9219 L171.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="182.5" y="28.1543">conditional_t</text>
@@ -27,8 +27,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="154.5" x2="293.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="154.5" x2="293.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="330" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f176mde574j5b9)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="330" y="8"/>
       <ellipse cx="345" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M347.9688,29.6406 Q347.3906,29.9375 346.75,30.0781 Q346.1094,30.2344 345.4063,30.2344 Q342.9063,30.2344 341.5781,28.5938 Q340.2656,26.9375 340.2656,23.8125 Q340.2656,20.6875 341.5781,19.0313 Q342.9063,17.375 345.4063,17.375 Q346.1094,17.375 346.75,17.5313 Q347.4063,17.6875 347.9688,17.9844 L347.9688,20.7031 Q347.3438,20.125 346.75,19.8594 Q346.1563,19.5781 345.5313,19.5781 Q344.1875,19.5781 343.5,20.6563 Q342.8125,21.7188 342.8125,23.8125 Q342.8125,25.9063 343.5,26.9844 Q344.1875,28.0469 345.5313,28.0469 Q346.1563,28.0469 346.75,27.7813 Q347.3438,27.5 347.9688,26.9219 L347.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="359" y="28.1543">conditional_t</text>
@@ -37,8 +37,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="331" x2="611" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="331" x2="611" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="647.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f176mde574j5b9)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="647.5" y="8"/>
       <ellipse cx="662.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M665.4688,29.6406 Q664.8906,29.9375 664.25,30.0781 Q663.6094,30.2344 662.9063,30.2344 Q660.4063,30.2344 659.0781,28.5938 Q657.7656,26.9375 657.7656,23.8125 Q657.7656,20.6875 659.0781,19.0313 Q660.4063,17.375 662.9063,17.375 Q663.6094,17.375 664.25,17.5313 Q664.9063,17.6875 665.4688,17.9844 L665.4688,20.7031 Q664.8438,20.125 664.25,19.8594 Q663.6563,19.5781 663.0313,19.5781 Q661.6875,19.5781 661,20.6563 Q660.3125,21.7188 660.3125,23.8125 Q660.3125,25.9063 661,26.9844 Q661.6875,28.0469 663.0313,28.0469 Q663.6563,28.0469 664.25,27.7813 Q664.8438,27.5 665.4688,26.9219 L665.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="676.5" y="28.1543">conditional_t</text>
@@ -47,8 +47,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648.5" x2="931.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648.5" x2="931.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fekzz09dqtn0u)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="400.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f176mde574j5b9)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="400.5" y="116"/>
       <ellipse cx="415.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M418.4688,137.6406 Q417.8906,137.9375 417.25,138.0781 Q416.6094,138.2344 415.9063,138.2344 Q413.4063,138.2344 412.0781,136.5938 Q410.7656,134.9375 410.7656,131.8125 Q410.7656,128.6875 412.0781,127.0313 Q413.4063,125.375 415.9063,125.375 Q416.6094,125.375 417.25,125.5313 Q417.9063,125.6875 418.4688,125.9844 L418.4688,128.7031 Q417.8438,128.125 417.25,127.8594 Q416.6563,127.5781 416.0313,127.5781 Q414.6875,127.5781 414,128.6563 Q413.3125,129.7188 413.3125,131.8125 Q413.3125,133.9063 414,134.9844 Q414.6875,136.0469 416.0313,136.0469 Q416.6563,136.0469 417.25,135.7813 Q417.8438,135.5 418.4688,134.9219 L418.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="429.5" y="136.1543">conditional_t</text>
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index cd9f6346..6d23e980 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f15p2adrxbjoc4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1c6b12nzq0nxq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6b12nzq0nxq)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
       <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
       <ellipse cx="92.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="54.2104">base : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
     <ellipse cx="92.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="75.0151">foo() = 0 : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6b12nzq0nxq)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
       <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
@@ -35,35 +35,35 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
       <ellipse cx="295" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="54.2104">base : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
     <ellipse cx="295" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="75.0151">foo() = 0 : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6b12nzq0nxq)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
       <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
       <ellipse cx="17" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="188.2104">b : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
     <ellipse cx="17" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6b12nzq0nxq)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
       <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
@@ -71,35 +71,35 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
       <ellipse cx="273" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="188.2104">b : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
     <ellipse cx="273" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6b12nzq0nxq)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
       <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
       <ellipse cx="139" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="188.2104">a : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
     <ellipse cx="139" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f15p2adrxbjoc4)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1c6b12nzq0nxq)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
       <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
@@ -107,11 +107,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
       <ellipse cx="417" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="188.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index 632fa443..3c4bfbbf 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:416px;height:390px;" version="1.1" viewBox="0 0 416 390" width="416px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="flhdusuru3g27" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8aszqy3wkkyr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="144.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8aszqy3wkkyr)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="144.5" y="306"/>
       <ellipse cx="180.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M183.6188,327.6406 Q183.0406,327.9375 182.4,328.0781 Q181.7594,328.2344 181.0563,328.2344 Q178.5563,328.2344 177.2281,326.5938 Q175.9156,324.9375 175.9156,321.8125 Q175.9156,318.6875 177.2281,317.0313 Q178.5563,315.375 181.0563,315.375 Q181.7594,315.375 182.4,315.5313 Q183.0563,315.6875 183.6188,315.9844 L183.6188,318.7031 Q182.9938,318.125 182.4,317.8594 Q181.8063,317.5781 181.1813,317.5781 Q179.8375,317.5781 179.15,318.6563 Q178.4625,319.7188 178.4625,321.8125 Q178.4625,323.9063 179.15,324.9844 Q179.8375,326.0469 181.1813,326.0469 Q181.8063,326.0469 182.4,325.7813 Q182.9938,325.5 183.6188,324.9219 L183.6188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="199.35" y="326.1543">A</text>
@@ -18,17 +18,17 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="237.5" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="241.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="150.5" y="344"/>
       <ellipse cx="155.5" cy="349" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="164.5" y="352.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="241.5" y1="358.8047" y2="358.8047"/>
     <ellipse cx="155.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="164.5" y="373.0151">get_a() : T &amp;</text>
-    <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="21" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f8aszqy3wkkyr)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="21" y="197"/>
     <ellipse cx="36" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M38.9688,218.6406 Q38.3906,218.9375 37.75,219.0781 Q37.1094,219.2344 36.4063,219.2344 Q33.9063,219.2344 32.5781,217.5938 Q31.2656,215.9375 31.2656,212.8125 Q31.2656,209.6875 32.5781,208.0313 Q33.9063,206.375 36.4063,206.375 Q37.1094,206.375 37.75,206.5313 Q38.4063,206.6875 38.9688,206.9844 L38.9688,209.7031 Q38.3438,209.125 37.75,208.8594 Q37.1563,208.5781 36.5313,208.5781 Q35.1875,208.5781 34.5,209.6563 Q33.8125,210.7188 33.8125,212.8125 Q33.8125,214.9063 34.5,215.9844 Q35.1875,217.0469 36.5313,217.0469 Q37.1563,217.0469 37.75,216.7813 Q38.3438,216.5 38.9688,215.9219 L38.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="50" y="217.1543">A</text>
@@ -36,7 +36,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="67" y="206.1387">intmap</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22" x2="107" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22" x2="107" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="143.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f8aszqy3wkkyr)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="143.5" y="197"/>
     <ellipse cx="158.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M161.4688,218.6406 Q160.8906,218.9375 160.25,219.0781 Q159.6094,219.2344 158.9063,219.2344 Q156.4063,219.2344 155.0781,217.5938 Q153.7656,215.9375 153.7656,212.8125 Q153.7656,209.6875 155.0781,208.0313 Q156.4063,206.375 158.9063,206.375 Q159.6094,206.375 160.25,206.5313 Q160.9063,206.6875 161.4688,206.9844 L161.4688,209.7031 Q160.8438,209.125 160.25,208.8594 Q159.6563,208.5781 159.0313,208.5781 Q157.6875,208.5781 157,209.6563 Q156.3125,210.7188 156.3125,212.8125 Q156.3125,214.9063 157,215.9844 Q157.6875,217.0469 159.0313,217.0469 Q159.6563,217.0469 160.25,216.7813 Q160.8438,216.5 161.4688,215.9219 L161.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="172.5" y="217.1543">A</text>
@@ -44,7 +44,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="189.5" y="206.1387">thestring</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="144.5" x2="242.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="144.5" x2="242.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="278.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f8aszqy3wkkyr)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="278.5" y="197"/>
     <ellipse cx="293.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M296.4688,218.6406 Q295.8906,218.9375 295.25,219.0781 Q294.6094,219.2344 293.9063,219.2344 Q291.4063,219.2344 290.0781,217.5938 Q288.7656,215.9375 288.7656,212.8125 Q288.7656,209.6875 290.0781,208.0313 Q291.4063,206.375 293.9063,206.375 Q294.6094,206.375 295.25,206.5313 Q295.9063,206.6875 296.4688,206.9844 L296.4688,209.7031 Q295.8438,209.125 295.25,208.8594 Q294.6563,208.5781 294.0313,208.5781 Q292.6875,208.5781 292,209.6563 Q291.3125,210.7188 291.3125,212.8125 Q291.3125,214.9063 292,215.9844 Q292.6875,217.0469 294.0313,217.0469 Q294.6563,217.0469 295.25,216.7813 Q295.8438,216.5 296.4688,215.9219 L296.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="307.5" y="217.1543">A</text>
@@ -52,32 +52,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="324.5" y="206.1387">string_vector</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="279.5" x2="401.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="279.5" x2="401.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#flhdusuru3g27)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8aszqy3wkkyr)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="6" y="8"/>
       <ellipse cx="135.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M138.2188,29.6406 Q137.6406,29.9375 137,30.0781 Q136.3594,30.2344 135.6563,30.2344 Q133.1563,30.2344 131.8281,28.5938 Q130.5156,26.9375 130.5156,23.8125 Q130.5156,20.6875 131.8281,19.0313 Q133.1563,17.375 135.6563,17.375 Q136.3594,17.375 137,17.5313 Q137.6563,17.6875 138.2188,17.9844 L138.2188,20.7031 Q137.5938,20.125 137,19.8594 Q136.4063,19.5781 135.7813,19.5781 Q134.4375,19.5781 133.75,20.6563 Q133.0625,21.7188 133.0625,23.8125 Q133.0625,25.9063 133.75,26.9844 Q134.4375,28.0469 135.7813,28.0469 Q136.4063,28.0469 137,27.7813 Q137.5938,27.5 138.2188,26.9219 L138.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="280" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="26" y="54.2104">a_string : A&lt;thestring&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="26" y="67.0151">a_vector_string : A&lt;string_vector&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="71.6094"/>
       <ellipse cx="17" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="26" y="79.8198">a_int_map : A&lt;intmap&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="280" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index 9b32c192..478bfc0a 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frpv1bd4ay76r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1uddxom0dosb3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
       <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L26" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L26" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L26" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L26" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
       <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L56" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L56" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L56" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L56" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
       <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L69" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L69" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L69" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L69" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
       <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L75" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L75" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L75" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L75" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
       <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L86" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L86" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L86" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L86" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
       <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
@@ -61,44 +61,44 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="52" x="2098.5" y="365.1387">T,V,int N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="394"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L87" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L87" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="402.2104">t : T[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="406.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="408.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L88" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L88" xlink:show="new" xlink:title="v" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="415.0151">v : V</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="421.6094" y2="421.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L96" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L96" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L96" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L96" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
       <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L99" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00050/t00050.cc#L99" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frpv1bd4ay76r)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L99" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00050/t00050.cc#L99" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uddxom0dosb3)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
       <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
     </a>
-    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
@@ -125,50 +125,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
-    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
-    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
-    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
-    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
-    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
-    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
-    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
-    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
-    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
-    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#frpv1bd4ay76r)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f1uddxom0dosb3)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index 79de51fe..7962fbb2 100644
--- a/docs/test_cases/t00051_class.svg
+++ b/docs/test_cases/t00051_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="583px" preserveAspectRatio="none" style="width:786px;height:583px;" version="1.1" viewBox="0 0 786 583" width="786px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1sxn22h3dw1vc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fjxpvssz7hscb" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="112.0234" id="C_0000704524754474791953" style="stroke: #A80036; stroke-width: 1.5;" width="215" x="269.5" y="460"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjxpvssz7hscb)" height="112.0234" id="C_0000704524754474791953" style="stroke: #A80036; stroke-width: 1.5;" width="215" x="269.5" y="460"/>
       <ellipse cx="354.25" cy="476" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M357.2188,481.6406 Q356.6406,481.9375 356,482.0781 Q355.3594,482.2344 354.6563,482.2344 Q352.1563,482.2344 350.8281,480.5938 Q349.5156,478.9375 349.5156,475.8125 Q349.5156,472.6875 350.8281,471.0313 Q352.1563,469.375 354.6563,469.375 Q355.3594,469.375 356,469.5313 Q356.6563,469.6875 357.2188,469.9844 L357.2188,472.7031 Q356.5938,472.125 356,471.8594 Q355.4063,471.5781 354.7813,471.5781 Q353.4375,471.5781 352.75,472.6563 Q352.0625,473.7188 352.0625,475.8125 Q352.0625,477.9063 352.75,478.9844 Q353.4375,480.0469 354.7813,480.0469 Q355.4063,480.0469 356,479.7813 Q356.5938,479.5 357.2188,478.9219 L357.2188,481.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="374.75" y="480.1543">B</text>
@@ -18,18 +18,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="25" x="461.5" y="469.1387">F,FF</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="483.5" y1="492" y2="492"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="275.5" y="498"/>
       <ellipse cx="280.5" cy="503" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="289.5" y="506.2104">f_ : F</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="275.5" y="510.8047"/>
       <ellipse cx="280.5" cy="515.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="289.5" y="519.0151">ff_ : FF</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="270.5" x2="483.5" y1="525.6094" y2="525.6094"/>
@@ -39,8 +39,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="289.5" y="552.6245">f() : void</text>
     <ellipse cx="280.5" cy="562.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="289.5" y="565.4292">ff() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="112.0234" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="40.5" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjxpvssz7hscb)" height="112.0234" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="40.5" y="288"/>
       <ellipse cx="69.45" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M72.4188,309.6406 Q71.8406,309.9375 71.2,310.0781 Q70.5594,310.2344 69.8563,310.2344 Q67.3563,310.2344 66.0281,308.5938 Q64.7156,306.9375 64.7156,303.8125 Q64.7156,300.6875 66.0281,299.0313 Q67.3563,297.375 69.8563,297.375 Q70.5594,297.375 71.2,297.5313 Q71.8563,297.6875 72.4188,297.9844 L72.4188,300.7031 Q71.7938,300.125 71.2,299.8594 Q70.6063,299.5781 69.9813,299.5781 Q68.6375,299.5781 67.95,300.6563 Q67.2625,301.7188 67.2625,303.8125 Q67.2625,305.9063 67.95,306.9844 Q68.6375,308.0469 69.9813,308.0469 Q70.6063,308.0469 71.2,307.7813 Q71.7938,307.5 72.4188,306.9219 L72.4188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="610" x="86.55" y="308.1543">B&lt;(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)&gt;</text>
@@ -53,22 +53,22 @@
       <ellipse cx="51.5" cy="364.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="60.5" y="367.8198">ff() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="372.4141"/>
       <ellipse cx="51.5" cy="377.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="282" x="60.5" y="380.6245">f_ : (lambda at ../../tests/t00051/t00051.cc:43:18)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="46.5" y="385.2188"/>
       <ellipse cx="51.5" cy="390.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="286" x="60.5" y="393.4292">ff_ : (lambda at ../../tests/t00051/t00051.cc:43:27)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="40.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjxpvssz7hscb)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="40.5" y="129"/>
       <ellipse cx="368.75" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M371.7188,150.6406 Q371.1406,150.9375 370.5,151.0781 Q369.8594,151.2344 369.1563,151.2344 Q366.6563,151.2344 365.3281,149.5938 Q364.0156,147.9375 364.0156,144.8125 Q364.0156,141.6875 365.3281,140.0313 Q366.6563,138.375 369.1563,138.375 Q369.8594,138.375 370.5,138.5313 Q371.1563,138.6875 371.7188,138.9844 L371.7188,141.7031 Q371.0938,141.125 370.5,140.8594 Q369.9063,140.5781 369.2813,140.5781 Q367.9375,140.5781 367.25,141.6563 Q366.5625,142.7188 366.5625,144.8125 Q366.5625,146.9063 367.25,147.9844 Q367.9375,149.0469 369.2813,149.0469 Q369.9063,149.0469 370.5,148.7813 Q371.0938,148.5 371.7188,147.9219 L371.7188,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="389.25" y="149.1543">A</text>
@@ -83,8 +83,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="48.5" y="215.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="349" x="60.5" y="221.6245">get_function() : (lambda at ../../tests/t00051/t00051.cc:48:16)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="340" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjxpvssz7hscb)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="340" x="6" y="8"/>
       <ellipse cx="112.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.7188,29.6406 Q115.1406,29.9375 114.5,30.0781 Q113.8594,30.2344 113.1563,30.2344 Q110.6563,30.2344 109.3281,28.5938 Q108.0156,26.9375 108.0156,23.8125 Q108.0156,20.6875 109.3281,19.0313 Q110.6563,17.375 113.1563,17.375 Q113.8594,17.375 114.5,17.5313 Q115.1563,17.6875 115.7188,17.9844 L115.7188,20.7031 Q115.0938,20.125 114.5,19.8594 Q113.9063,19.5781 113.2813,19.5781 Q111.9375,19.5781 111.25,20.6563 Q110.5625,21.7188 110.5625,23.8125 Q110.5625,25.9063 111.25,26.9844 Q111.9375,28.0469 113.2813,28.0469 Q113.9063,28.0469 114.5,27.7813 Q115.0938,27.5 115.7188,26.9219 L115.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="133.25" y="28.1543">A::custom_thread1</text>
@@ -93,8 +93,8 @@
       <ellipse cx="17" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="314" x="26" y="62.2104">custom_thread1(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sxn22h3dw1vc)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="394" x="381" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fjxpvssz7hscb)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="394" x="381" y="8"/>
       <ellipse cx="514.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M517.7188,29.6406 Q517.1406,29.9375 516.5,30.0781 Q515.8594,30.2344 515.1563,30.2344 Q512.6563,30.2344 511.3281,28.5938 Q510.0156,26.9375 510.0156,23.8125 Q510.0156,20.6875 511.3281,19.0313 Q512.6563,17.375 515.1563,17.375 Q515.8594,17.375 516.5,17.5313 Q517.1563,17.6875 517.7188,17.9844 L517.7188,20.7031 Q517.0938,20.125 516.5,19.8594 Q515.9063,19.5781 515.2813,19.5781 Q513.9375,19.5781 513.25,20.6563 Q512.5625,21.7188 512.5625,23.8125 Q512.5625,25.9063 513.25,26.9844 Q513.9375,28.0469 515.2813,28.0469 Q515.9063,28.0469 516.5,27.7813 Q517.0938,27.5 517.7188,26.9219 L517.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="535.25" y="28.1543">A::custom_thread2</text>
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index 5f20df98..9261ef6a 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="467px" preserveAspectRatio="none" style="width:324px;height:467px;" version="1.1" viewBox="0 0 324 467" width="324px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbr5cqffz34a2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fkhiwunlq2627" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,59 +9,59 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="77" x2="77" y1="38.2969" y2="427.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="175.5" x2="175.5" y1="38.2969" y2="427.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="303" x2="303" y1="38.2969" y2="427.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkhiwunlq2627)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#fkhiwunlq2627)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="446.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkhiwunlq2627)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#fkhiwunlq2627)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="446.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fkhiwunlq2627)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fbr5cqffz34a2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#fkhiwunlq2627)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="446.2217">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fbr5cqffz34a2)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fkhiwunlq2627)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159,65.4297,169,69.4297,159,73.4297,163,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="165" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="89" y="64.3638">add(int,int)</text>
     </a>
     <polygon fill="#A80036" points="93,79.4297,83,83.4297,93,87.4297,89,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="87" x2="175" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="286,108.5625,296,112.5625,286,116.5625,290,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="292" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="89" y="107.4966">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,137.6953,182,141.6953,192,145.6953,188,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="198" y="136.6294">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="228" y1="165.8281" y2="165.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="165.8281" y2="178.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="178.8281" y2="178.8281"/>
@@ -72,7 +72,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="228" x2="228" y1="202.8281" y2="215.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="228" y1="215.8281" y2="215.8281"/>
     <polygon fill="#A80036" points="191,211.8281,181,215.8281,191,219.8281,187,215.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="228" y1="239.9609" y2="239.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="239.9609" y2="252.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="252.9609" y2="252.9609"/>
@@ -81,14 +81,14 @@
     </a>
     <polygon fill="#A80036" points="286,292.9609,296,296.9609,286,300.9609,290,296.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="176" x2="292" y1="296.9609" y2="296.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,322.0938,182,326.0938,192,330.0938,188,326.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="326.0938" y2="326.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="198" y="321.0278">log_result(int)</text>
     </a>
     <polygon fill="#A80036" points="88,366.0938,78,370.0938,88,374.0938,84,370.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="82" x2="302" y1="370.0938" y2="370.0938"/>
-    <path d="M8,383.0938 L8,408.0938 L143,408.0938 L143,393.0938 L133,383.0938 L8,383.0938 " fill="#FBFB77" filter="url(#fbr5cqffz34a2)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,383.0938 L8,408.0938 L143,408.0938 L143,393.0938 L133,383.0938 L8,383.0938 " fill="#FBFB77" filter="url(#fkhiwunlq2627)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M133,383.0938 L133,393.0938 L143,393.0938 L133,383.0938 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="14" y="400.1606">Main test function</text>
   </g>
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 2738aa27..f0d87f24 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fmckmtgtyqpxd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fp4n3fx6f09eu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
-      <rect fill="#FEFECE" filter="url(#fmckmtgtyqpxd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fp4n3fx6f09eu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fmckmtgtyqpxd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fp4n3fx6f09eu)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index cd4241ad..54aefa87 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10tm2ddd0tvf4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4ahl8v6gvmcd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#f10tm2ddd0tvf4)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f4ahl8v6gvmcd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10tm2ddd0tvf4)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ahl8v6gvmcd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index 0d7f6cfa..92ce3a8b 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1k2850rq65rna" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lfms9oticg5t" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
@@ -29,87 +29,87 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#f1k2850rq65rna)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#f1lfms9oticg5t)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1k2850rq65rna)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lfms9oticg5t)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
     </a>
@@ -117,11 +117,11 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
     <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
     </a>
@@ -129,19 +129,19 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
     <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
     </a>
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index c7b39f4a..78f7c400 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f13p9otp0v016f" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1en5hs3cc47ek" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1en5hs3cc47ek)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1en5hs3cc47ek)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1en5hs3cc47ek)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1en5hs3cc47ek)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1en5hs3cc47ek)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1en5hs3cc47ek)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1en5hs3cc47ek)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1en5hs3cc47ek)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f13p9otp0v016f)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1en5hs3cc47ek)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f13p9otp0v016f)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1en5hs3cc47ek)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1en5hs3cc47ek)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1en5hs3cc47ek)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index 0abb88c5..4c5fcb7d 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:1034px;height:754px;" version="1.1" viewBox="0 0 1034 754" width="1034px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1sj0a0spic15d" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1qdkfhzmx1b4b" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="714.2891"/>
@@ -34,82 +34,82 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="654" x2="654" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="780" x2="780" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="923" x2="923" y1="38.2969" y2="714.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="733.2842">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="733.2842">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="733.2842">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="733.2842">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="733.2842">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="733.2842">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="623" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="623" y="733.2842">AA&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="710" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="710" y="733.2842">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="874" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sj0a0spic15d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#f1qdkfhzmx1b4b)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="874" y="733.2842">BB&lt;int,float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1sj0a0spic15d)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1qdkfhzmx1b4b)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
@@ -118,12 +118,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
@@ -132,59 +132,59 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="539,237.9609,549,241.9609,539,245.9609,543,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="545" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="236.895">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="637.5,267.0938,647.5,271.0938,637.5,275.0938,641.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="561" x2="643.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="568" y="266.0278">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="539,326.2266,549,330.2266,539,334.2266,543,330.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="545" y1="330.2266" y2="330.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="325.1606">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="637.5,355.3594,647.5,359.3594,637.5,363.3594,641.5,359.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="561" x2="643.5" y1="359.3594" y2="359.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="568" y="354.2935">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,414.4922,773,418.4922,763,422.4922,767,418.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="769" y1="418.4922" y2="418.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="413.4263">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,443.625,660.5,447.625,670.5,451.625,666.5,447.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="774" y1="447.625" y2="447.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="442.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,502.7578,773,506.7578,763,510.7578,767,506.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="769" y1="506.7578" y2="506.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="501.6919">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,531.8906,660.5,535.8906,670.5,539.8906,666.5,535.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="774" y1="535.8906" y2="535.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="530.8247">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="906,591.0234,916,595.0234,906,599.0234,910,595.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="912" y1="595.0234" y2="595.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="589.9575">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="928" x2="975" y1="619.1563" y2="619.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="975" x2="975" y1="619.1563" y2="632.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="934" x2="975" y1="632.1563" y2="632.1563"/>
       <polygon fill="#A80036" points="944,628.1563,934,632.1563,944,636.1563,940,632.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="940" y="614.0903">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,662.2891,660.5,666.2891,670.5,670.2891,666.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="922" y1="666.2891" y2="666.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="661.2231">aa2(int)</text>
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index 0bec7169..de5b2d02 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1sx5e15ash1rn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1269qjegsn62o" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1sx5e15ash1rn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1269qjegsn62o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1sx5e15ash1rn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1269qjegsn62o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index 778e912a..7c6b8f1e 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ldcg084xamk9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fol5v5t9g8aii" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1ldcg084xamk9)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#fol5v5t9g8aii)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ldcg084xamk9)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fol5v5t9g8aii)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index 751d78bb..173c91ac 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18yw4bcxsfjpg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3amieuiwo593" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f18yw4bcxsfjpg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f3amieuiwo593)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f18yw4bcxsfjpg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f3amieuiwo593)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 89a3d2d5..6c3e2a69 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1w33yzwl1x6ca" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6ld3q4ce6ft3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ld3q4ce6ft3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f6ld3q4ce6ft3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ld3q4ce6ft3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f6ld3q4ce6ft3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6ld3q4ce6ft3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1w33yzwl1x6ca)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f6ld3q4ce6ft3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1w33yzwl1x6ca)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f6ld3q4ce6ft3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index a1febec8..3da953c4 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ndr4uk1qyobw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nys9y9iecb40" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nys9y9iecb40)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1nys9y9iecb40)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1nys9y9iecb40)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ndr4uk1qyobw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1nys9y9iecb40)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1ndr4uk1qyobw)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1nys9y9iecb40)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
@@ -52,26 +52,26 @@
     <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
       <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
@@ -81,14 +81,14 @@
     <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
       <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
@@ -98,7 +98,7 @@
     <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index 4c90e47f..623a3274 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1203px" preserveAspectRatio="none" style="width:1784px;height:1203px;" version="1.1" viewBox="0 0 1784 1203" width="1784px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1kv0tt0em0cuc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1whirpqwvcq9n" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="272" x2="272" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="484" x2="484" y1="38.2969" y2="1163.4844"/>
@@ -43,122 +43,122 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1178.5" x2="1178.5" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1554.5" x2="1554.5" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1762.5" x2="1762.5" y1="38.2969" y2="1163.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L58" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L58" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L58" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L58" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1182.4795">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L66" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L66" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L66" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L66" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="1182.4795">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="1182.4795">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L79" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L79" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L79" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L79" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="1182.4795">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L47" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L47" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L47" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L47" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="22.9951">R&lt;R::(lambda ../../tests/t20012/t20012.cc:85:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="1182.4795">R&lt;R::(lambda ../../tests/t20012/t20012.cc:85:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L85" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1755.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#f1kv0tt0em0cuc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f1whirpqwvcq9n)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1755.5" y="1182.4795">D</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
-    <rect fill="#FFFFFF" filter="url(#f1kv0tt0em0cuc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f1whirpqwvcq9n)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="255.5,65.4297,265.5,69.4297,255.5,73.4297,259.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="261.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,94.5625,477.5,98.5625,467.5,102.5625,471.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="505.5,131.6953,495.5,135.6953,505.5,139.6953,501.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="169.8281" y2="169.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="169.8281" y2="182.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="182.8281" y2="182.8281"/>
       <polygon fill="#A80036" points="510.5,178.8281,500.5,182.8281,510.5,186.8281,506.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,237.9609,540.5,241.9609,530.5,245.9609,534.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="266.0938" y2="266.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="266.0938" y2="279.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="279.0938" y2="279.0938"/>
       <polygon fill="#A80036" points="568.5,275.0938,558.5,279.0938,568.5,283.0938,564.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="313.2266" y2="313.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="313.2266" y2="326.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="326.2266" y2="326.2266"/>
@@ -167,67 +167,67 @@
     </a>
     <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="271.5" y1="370.2266" y2="370.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L83" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L83" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L83" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L83" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="743,395.3594,753,399.3594,743,403.3594,747,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="749" y1="399.3594" y2="399.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L80" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L80" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="955.5,424.4922,965.5,428.4922,955.5,432.4922,959.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="765" x2="961.5" y1="428.4922" y2="428.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="772" y="423.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="452.625" y2="452.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="452.625" y2="465.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="465.625" y2="465.625"/>
       <polygon fill="#A80036" points="993.5,461.625,983.5,465.625,993.5,469.625,989.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="447.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="499.7578" y2="499.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="499.7578" y2="512.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="512.7578" y2="512.7578"/>
       <polygon fill="#A80036" points="998.5,508.7578,988.5,512.7578,998.5,516.7578,994.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="994.5" y="494.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288.5,567.8906,278.5,571.8906,288.5,575.8906,284.5,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282.5" x2="754" y1="571.8906" y2="571.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="294.5" y="566.8247">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,597.0234,477.5,601.0234,467.5,605.0234,471.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="601.0234" y2="601.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="595.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="625.1563" y2="625.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="625.1563" y2="638.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="638.1563" y2="638.1563"/>
       <polygon fill="#A80036" points="505.5,634.1563,495.5,638.1563,505.5,642.1563,501.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="620.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="672.2891" y2="672.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="672.2891" y2="685.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="685.2891" y2="685.2891"/>
       <polygon fill="#A80036" points="510.5,681.2891,500.5,685.2891,510.5,689.2891,506.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="667.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,740.4219,540.5,744.4219,530.5,748.4219,534.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="744.4219" y2="744.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="739.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="768.5547" y2="768.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="768.5547" y2="781.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="781.5547" y2="781.5547"/>
       <polygon fill="#A80036" points="568.5,777.5547,558.5,781.5547,568.5,785.5547,564.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="763.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="815.6875" y2="815.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="815.6875" y2="828.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="828.6875" y2="828.6875"/>
@@ -238,29 +238,29 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="272.5" x2="749" y1="872.6875" y2="872.6875"/>
     <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="759" y1="886.6875" y2="886.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L87" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L87" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L87" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L87" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1161.5,911.8203,1171.5,915.8203,1161.5,919.8203,1165.5,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1167.5" y1="915.8203" y2="915.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="910.7544">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1537.5,940.9531,1547.5,944.9531,1537.5,948.9531,1541.5,944.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1183.5" x2="1543.5" y1="944.9531" y2="944.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="1190.5" y="939.8872">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="988.5,970.0859,978.5,974.0859,988.5,978.0859,984.5,974.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="982.5" x2="1548.5" y1="974.0859" y2="974.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="994.5" y="969.02">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="998.2188" y2="998.2188"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="998.2188" y2="1011.2188"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="1011.2188" y2="1011.2188"/>
       <polygon fill="#A80036" points="993.5,1007.2188,983.5,1011.2188,993.5,1015.2188,989.5,1011.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="993.1528">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="1045.3516" y2="1045.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="1045.3516" y2="1058.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="1058.3516" y2="1058.3516"/>
@@ -269,7 +269,7 @@
     </a>
     <polygon fill="#A80036" points="1189.5,1098.3516,1179.5,1102.3516,1189.5,1106.3516,1185.5,1102.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1183.5" x2="1553.5" y1="1102.3516" y2="1102.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L93" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20012/t20012.cc#L93" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L93" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20012/t20012.cc#L93" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1746,1127.4844,1756,1131.4844,1746,1135.4844,1750,1131.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1752" y1="1131.4844" y2="1131.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="58" x="53" y="1126.4185">add5(int)</text>
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index 5ee90a2d..5c6b9b3d 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fs6s3bub0enm3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f2kglzthzwdma" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kglzthzwdma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f2kglzthzwdma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kglzthzwdma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f2kglzthzwdma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2kglzthzwdma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fs6s3bub0enm3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#f2kglzthzwdma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fs6s3bub0enm3)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f2kglzthzwdma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -58,12 +58,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
@@ -72,12 +72,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index f27cc46b..4724e20a 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fynrt5ko3v75r" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kpgsle17o0tw" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fynrt5ko3v75r)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f1kpgsle17o0tw)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fynrt5ko3v75r)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1kpgsle17o0tw)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
@@ -67,12 +67,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
@@ -81,17 +81,17 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index b6544984..c139cf56 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1miu8nm50onvy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1p3yhlfo1kgol" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1p3yhlfo1kgol)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1p3yhlfo1kgol)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1p3yhlfo1kgol)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1p3yhlfo1kgol)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1p3yhlfo1kgol)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1miu8nm50onvy)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1p3yhlfo1kgol)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1miu8nm50onvy)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1p3yhlfo1kgol)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1p3yhlfo1kgol)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index d79a46c1..731ef4eb 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f10u00t3d0b7uc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fe0lxx2zfafgf" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe0lxx2zfafgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#fe0lxx2zfafgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe0lxx2zfafgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#fe0lxx2zfafgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fe0lxx2zfafgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f10u00t3d0b7uc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#fe0lxx2zfafgf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f10u00t3d0b7uc)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fe0lxx2zfafgf)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index 02f796e2..df1f4b9f 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f67cnykww8p7i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fgrv7slcal8s5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,65 +9,65 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
-    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fgrv7slcal8s5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fgrv7slcal8s5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fgrv7slcal8s5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fgrv7slcal8s5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fgrv7slcal8s5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
-    <rect fill="#FEFECE" filter="url(#f67cnykww8p7i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fgrv7slcal8s5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f67cnykww8p7i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fgrv7slcal8s5)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index 3d56f2e0..61a5f3b4 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7vvjernpx3bm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fbllt23jlcsvp" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,14 +9,14 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
@@ -25,93 +25,93 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7vvjernpx3bm)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fbllt23jlcsvp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f7vvjernpx3bm)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fbllt23jlcsvp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index bd9ca548..8fcdcbb1 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1csbfxy12qnbg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="famotsww1luab" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
-      <rect fill="#FEFECE" filter="url(#f1csbfxy12qnbg)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#famotsww1luab)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1csbfxy12qnbg)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#famotsww1luab)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index bbde7194..4540d720 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="832px" preserveAspectRatio="none" style="width:346px;height:832px;" version="1.1" viewBox="0 0 346 832" width="346px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1f672jzabx66m" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flncblvsaufmv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,78 +9,78 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="293.9297" style="stroke: none; stroke-width: 1.0;" width="252.5" x="13" y="115.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
     <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="232.5" x="23" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="231.5" x2="231.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="290.5" x2="290.5" y1="38.2969" y2="792.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="811.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="811.5498">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="811.5498">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="224.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="224.5" y="811.5498">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L34" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L34" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L34" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L34" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="262.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1f672jzabx66m)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#flncblvsaufmv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="262.5" y="811.5498">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
-    <rect fill="#FFFFFF" filter="url(#f1f672jzabx66m)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
+    <rect fill="#FFFFFF" filter="url(#flncblvsaufmv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
@@ -91,7 +91,7 @@
     <path d="M23,124.5625 L87,124.5625 L87,131.5625 L77,141.5625 L23,141.5625 L23,124.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="137.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,158.8281,126,162.8281,116,166.8281,120,162.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="162.8281" y2="162.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="157.7622">[</text>
@@ -100,7 +100,7 @@
     </a>
     <polygon fill="#A80036" points="82,172.8281,72,176.8281,82,180.8281,78,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="176.8281" y2="176.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,201.9609,163.5,205.9609,153.5,209.9609,157.5,205.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="205.9609" y2="205.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="200.895">[</text>
@@ -109,7 +109,7 @@
     </a>
     <polygon fill="#A80036" points="82,215.9609,72,219.9609,82,223.9609,78,219.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="219.9609" y2="219.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,245.0938,224.5,249.0938,214.5,253.0938,218.5,249.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="249.0938" y2="249.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="244.0278">b1()</text>
@@ -117,7 +117,7 @@
     <polygon fill="#A80036" points="82,259.0938,72,263.0938,82,267.0938,78,263.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="230.5" y1="263.0938" y2="263.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="255.5" y1="272.0938" y2="272.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,290.2266,126,294.2266,116,298.2266,120,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="294.2266" y2="294.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="289.1606">[</text>
@@ -126,21 +126,21 @@
     </a>
     <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="308.2266" y2="308.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,333.3594,224.5,337.3594,214.5,341.3594,218.5,337.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="337.3594" y2="337.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="332.2935">b2()</text>
     </a>
     <polygon fill="#A80036" points="82,347.3594,72,351.3594,82,355.3594,78,351.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="230.5" y1="351.3594" y2="351.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,383.4922,126,387.4922,116,391.4922,120,387.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="387.4922" y2="387.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="382.4263">a4()</text>
     </a>
     <polygon fill="#A80036" points="82,397.4922,72,401.4922,82,405.4922,78,401.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="401.4922" y2="401.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,433.625,224.5,437.625,214.5,441.625,218.5,437.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="437.625" y2="437.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="432.5591">log()</text>
@@ -148,7 +148,7 @@
     <path d="M23,482.625 L87,482.625 L87,489.625 L77,499.625 L23,499.625 L23,482.625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="495.6919">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,516.8906,163.5,520.8906,153.5,524.8906,157.5,520.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="520.8906" y2="520.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="78" y="515.8247">c1()</text>
@@ -156,7 +156,7 @@
     <path d="M146.5,535.8906 L210.5,535.8906 L210.5,542.8906 L200.5,552.8906 L146.5,552.8906 L146.5,535.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="548.9575">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="569.1563" y2="569.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="569.1563" y2="582.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="582.1563" y2="582.1563"/>
@@ -169,7 +169,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="606.1563" y2="619.1563"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="619.1563" y2="619.1563"/>
     <polygon fill="#A80036" points="185.5,615.1563,175.5,619.1563,185.5,623.1563,181.5,619.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="643.2891" y2="643.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="643.2891" y2="656.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="656.2891" y2="656.2891"/>
@@ -179,7 +179,7 @@
     <path d="M23,715.2891 L87,715.2891 L87,722.2891 L77,732.2891 L23,732.2891 L23,715.2891 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="728.356">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20020/t20020.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20020/t20020.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="273.5,749.5547,283.5,753.5547,273.5,757.5547,277.5,753.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="279.5" y1="753.5547" y2="753.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="748.4888">d1(int,int)</text>
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index a1af68ff..a2cd9e19 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbbhlzvv9v32i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17dovg9sn6dwx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fbbhlzvv9v32i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f17dovg9sn6dwx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fbbhlzvv9v32i)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f17dovg9sn6dwx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
     <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
@@ -89,7 +89,7 @@
     <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
@@ -102,7 +102,7 @@
     <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
@@ -120,7 +120,7 @@
     </a>
     <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
@@ -129,14 +129,14 @@
     </a>
     <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
     </a>
     <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
@@ -148,7 +148,7 @@
     <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="552.9575">b2()</text>
@@ -158,7 +158,7 @@
     <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
@@ -167,7 +167,7 @@
     </a>
     <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="677.356">b2()</text>
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 957b4cc0..076b3951 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="186px" preserveAspectRatio="none" style="width:165px;height:186px;" version="1.1" viewBox="0 0 165 186" width="165px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ppq4uw0jcnjz" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f83k2gwynswg6" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,39 +9,39 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f83k2gwynswg6)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f83k2gwynswg6)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f83k2gwynswg6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="146.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="146.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="144.5" x2="144.5" y1="38.2969" y2="146.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f83k2gwynswg6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#f83k2gwynswg6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="165.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f83k2gwynswg6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#f83k2gwynswg6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="165.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f83k2gwynswg6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ppq4uw0jcnjz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#f83k2gwynswg6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="165.5576">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ppq4uw0jcnjz)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f83k2gwynswg6)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f83k2gwynswg6)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f83k2gwynswg6)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="127.5,94.5625,137.5,98.5625,127.5,102.5625,131.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="133.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="109.5" y="93.4966">b()</text>
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index 40d52f1b..7535f21f 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fols92mqjmu8k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7tzfrv8fi8s3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,37 +9,37 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7tzfrv8fi8s3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#f7tzfrv8fi8s3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7tzfrv8fi8s3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fols92mqjmu8k)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#f7tzfrv8fi8s3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#fols92mqjmu8k)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f7tzfrv8fi8s3)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
@@ -47,7 +47,7 @@
     <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
@@ -73,7 +73,7 @@
     <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
@@ -86,7 +86,7 @@
     <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index c7d346fc..dc4e5ec2 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1me15gkhv6mwu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f110zmjpa899ud" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
@@ -33,36 +33,36 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f110zmjpa899ud)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f110zmjpa899ud)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f110zmjpa899ud)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f110zmjpa899ud)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f110zmjpa899ud)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1me15gkhv6mwu)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f110zmjpa899ud)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f1me15gkhv6mwu)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f110zmjpa899ud)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
@@ -85,7 +85,7 @@
     <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
@@ -98,7 +98,7 @@
     <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
@@ -111,7 +111,7 @@
     <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
@@ -124,7 +124,7 @@
     <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
@@ -134,7 +134,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
@@ -143,7 +143,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
@@ -152,7 +152,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
@@ -161,7 +161,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index 2b3a9220..8b681a83 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:220px;height:241px;" version="1.1" viewBox="0 0 220 241" width="220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fviaeucah56je" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1adkuyqbn0g92" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,41 +9,41 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="201.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1adkuyqbn0g92)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#f1adkuyqbn0g92)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="220.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1adkuyqbn0g92)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#f1adkuyqbn0g92)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="220.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1adkuyqbn0g92)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#fviaeucah56je)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#f1adkuyqbn0g92)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="220.5576">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fviaeucah56je)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1adkuyqbn0g92)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="107.5" x2="149.5" y1="98.5625" y2="98.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="98.5625" y2="111.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="111.5625" y2="111.5625"/>
@@ -52,7 +52,7 @@
     </a>
     <polygon fill="#A80036" points="57,151.5625,47,155.5625,57,159.5625,53,155.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="155.5625" y2="155.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="150,165.5625,160,169.5625,150,173.5625,154,169.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="169.5625" y2="169.5625"/>
     </a>
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index d7ef3896..aa655ac1 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f12kwc9lo2flyv" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3sc73tqvj1p8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f3sc73tqvj1p8)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f3sc73tqvj1p8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3sc73tqvj1p8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f3sc73tqvj1p8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3sc73tqvj1p8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f12kwc9lo2flyv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f3sc73tqvj1p8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f12kwc9lo2flyv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f3sc73tqvj1p8)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f3sc73tqvj1p8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index 1771888c..e8de8f54 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lxrbsg3ga1nc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f13ue5v6nqjrh1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f13ue5v6nqjrh1)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13ue5v6nqjrh1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ue5v6nqjrh1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f13ue5v6nqjrh1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f13ue5v6nqjrh1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1lxrbsg3ga1nc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f13ue5v6nqjrh1)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1lxrbsg3ga1nc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f13ue5v6nqjrh1)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f13ue5v6nqjrh1)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index 1dc328ef..31abf4e6 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:148px;height:304px;" version="1.1" viewBox="0 0 148 304" width="148px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hhybxvs6bnkv" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f12p1jq6ul9tmz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,50 +9,50 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="123" x="13" y="201.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="112" x2="112" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12p1jq6ul9tmz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f12p1jq6ul9tmz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f12p1jq6ul9tmz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="106" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1hhybxvs6bnkv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f12p1jq6ul9tmz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="106" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1hhybxvs6bnkv)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f12p1jq6ul9tmz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,89.5625,105.5,93.5625,95.5,97.5625,99.5,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="88.4966">a()</text>
     </a>
     <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,132.6953,105.5,136.6953,95.5,140.6953,99.5,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="136.6953" y2="136.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
     </a>
     <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,175.8281,105.5,179.8281,95.5,183.8281,99.5,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="179.8281" y2="179.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="193.8281" y2="193.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="136" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,220.9609,105.5,224.9609,95.5,228.9609,99.5,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="224.9609" y2="224.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index e2110411..a7a9c258 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="508px" preserveAspectRatio="none" style="width:1017px;height:508px;" version="1.1" viewBox="0 0 1017 508" width="1017px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1rqz4zm16z70c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fu3ua2xu13pip" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,60 +9,60 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="249" x2="249" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="498" x2="498" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="698" x2="698" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="879" x2="879" y1="38.2969" y2="468.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="487.4873">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="487.4873">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="487.4873">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="487.4873">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f1rqz4zm16z70c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#fu3ua2xu13pip)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="487.4873">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1rqz4zm16z70c)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#fu3ua2xu13pip)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,65.4297,691,69.4297,681,73.4297,685,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="687" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="78" y="64.3638">connect()</text>
@@ -73,21 +73,21 @@
     <path d="M23,138.5625 L87,138.5625 L87,145.5625 L77,155.5625 L23,155.5625 L23,138.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="151.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="232,172.8281,242,176.8281,232,180.8281,236,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="238" y1="176.8281" y2="176.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="171.7622">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="84" y="171.7622">send(std::string &amp;&amp;)</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="215" y="171.7622">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="301" y1="200.9609" y2="200.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="301" y1="200.9609" y2="213.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="260" x2="301" y1="213.9609" y2="213.9609"/>
       <polygon fill="#A80036" points="270,209.9609,260,213.9609,270,217.9609,266,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="266" y="195.895">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="862,228.9609,872,232.9609,862,236.9609,866,232.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="259" x2="868" y1="232.9609" y2="232.9609"/>
     </a>
@@ -97,7 +97,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="301" y1="265.9609" y2="278.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="254" x2="301" y1="278.9609" y2="278.9609"/>
     <polygon fill="#A80036" points="264,274.9609,254,278.9609,264,282.9609,260,278.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="481,299.0938,491,303.0938,481,307.0938,485,303.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="487" y1="303.0938" y2="303.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="261" y="298.0278">send(std::string &amp;&amp;)</text>
@@ -108,7 +108,7 @@
     <path d="M389,342.2266 L453,342.2266 L453,349.2266 L443,359.2266 L389,359.2266 L389,342.2266 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="404" y="355.2935">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,376.4922,691,380.4922,681,384.4922,685,380.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="503" x2="687" y1="380.4922" y2="380.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="510" y="375.4263">[</text>
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 4f9e5bd8..6c5ff943 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="264px" preserveAspectRatio="none" style="width:854px;height:264px;" version="1.1" viewBox="0 0 854 264" width="854px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1boi03qz5lgl6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fi6skh1hvg62w" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,63 +9,63 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="63.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="63.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="157.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1boi03qz5lgl6)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fi6skh1hvg62w)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="157.9951">BB</text>
     </a>
-    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#f1boi03qz5lgl6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#fi6skh1hvg62w)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M482,157 L482,167 L492,167 L482,157 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="174.0669">A AAA note...</text>
-    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#f1boi03qz5lgl6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#fi6skh1hvg62w)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M264,8 L264,18 L274,18 L264,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="25.0669">This is namespace AA in namespace A</text>
-    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#f1boi03qz5lgl6)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#fi6skh1hvg62w)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M726,8 L726,18 L736,18 L726,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="25.0669">This is namespace AA in namespace B</text>
     <path d="M313.72,169.5 C337.7,169.5 361.68,169.5 385.66,169.5 " fill="none" id="C_0000274638237740249424-GMN868" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index cee5be09..d5a270ac 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1462px;height:402px;" version="1.1" viewBox="0 0 1462 402" width="1462px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgg41f2mm1zh1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ouuekc12yfqn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,113 +9,113 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="22,219,39,219,46,241.2969,1440,241.2969,1440,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="22,219,39,219,46,241.2969,1440,241.2969,1440,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="46,262,74,262,81,284.2969,1416,284.2969,1416,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="46,262,74,262,81,284.2969,1416,284.2969,1416,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="706,24,722,24,729,46.2969,836,46.2969,836,195,706,195,706,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L79" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="706,24,722,24,729,46.2969,836,46.2969,836,195,706,195,706,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="706" x2="729" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="710" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="730,67,756,67,763,89.2969,812,89.2969,812,171,730,171,730,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L79" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="730,67,756,67,763,89.2969,812,89.2969,812,171,730,171,730,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="730" x2="763" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="734" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1358.5,297,1385.5,297,1392.5,319.2969,1399.5,319.2969,1399.5,349.5938,1358.5,349.5938,1358.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="1358.5,297,1385.5,297,1392.5,319.2969,1399.5,319.2969,1399.5,349.5938,1358.5,349.5938,1358.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1358.5" x2="1392.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1362.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L14" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L14" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1282.5,297,1309.5,297,1316.5,319.2969,1323.5,319.2969,1323.5,349.5938,1282.5,349.5938,1282.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L14" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L14" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="1282.5,297,1309.5,297,1316.5,319.2969,1323.5,319.2969,1323.5,349.5938,1282.5,349.5938,1282.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1282.5" x2="1316.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1286.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1206.5,297,1233.5,297,1240.5,319.2969,1247.5,319.2969,1247.5,349.5938,1206.5,349.5938,1206.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L18" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L18" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="1206.5,297,1233.5,297,1240.5,319.2969,1247.5,319.2969,1247.5,349.5938,1206.5,349.5938,1206.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1206.5" x2="1240.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1210.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L22" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L22" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1130.5,297,1157.5,297,1164.5,319.2969,1171.5,319.2969,1171.5,349.5938,1130.5,349.5938,1130.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L22" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L22" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="1130.5,297,1157.5,297,1164.5,319.2969,1171.5,319.2969,1171.5,349.5938,1130.5,349.5938,1130.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1130.5" x2="1164.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1134.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L26" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L26" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="1054.5,297,1081.5,297,1088.5,319.2969,1095.5,319.2969,1095.5,349.5938,1054.5,349.5938,1054.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L26" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L26" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="1054.5,297,1081.5,297,1088.5,319.2969,1095.5,319.2969,1095.5,349.5938,1054.5,349.5938,1054.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1054.5" x2="1088.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1058.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L30" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="978.5,297,1005.5,297,1012.5,319.2969,1019.5,319.2969,1019.5,349.5938,978.5,349.5938,978.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L30" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L30" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="978.5,297,1005.5,297,1012.5,319.2969,1019.5,319.2969,1019.5,349.5938,978.5,349.5938,978.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="978.5" x2="1012.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="982.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L34" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L34" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="902.5,297,929.5,297,936.5,319.2969,943.5,319.2969,943.5,349.5938,902.5,349.5938,902.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L34" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L34" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="902.5,297,929.5,297,936.5,319.2969,943.5,319.2969,943.5,349.5938,902.5,349.5938,902.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="902.5" x2="936.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="906.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L38" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L38" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="826.5,297,853.5,297,860.5,319.2969,867.5,319.2969,867.5,349.5938,826.5,349.5938,826.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L38" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L38" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="826.5,297,853.5,297,860.5,319.2969,867.5,319.2969,867.5,349.5938,826.5,349.5938,826.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="826.5" x2="860.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="830.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L42" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="750.5,297,777.5,297,784.5,319.2969,791.5,319.2969,791.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L42" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L42" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="750.5,297,777.5,297,784.5,319.2969,791.5,319.2969,791.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="784.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="754.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L46" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L46" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L46" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L46" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="668.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L50" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L50" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L50" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L50" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="582.5" y="311.9951">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L54" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L54" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L54" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="496.5" y="311.9951">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L58" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L58" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L58" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L58" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="450.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="410.5" y="311.9951">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L62" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L62" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L66" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L66" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L66" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L66" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L70" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L70" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L70" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L70" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L74" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L74" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L74" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L74" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fgg41f2mm1zh1)" points="746,102,782,102,789,124.2969,796,124.2969,796,154.5938,746,154.5938,746,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L79" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30002/t30002.cc#L79" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1ouuekc12yfqn)" points="746,102,782,102,789,124.2969,796,124.2969,796,154.5938,746,154.5938,746,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="746" x2="789" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="750" y="116.9951">BBB</text>
     </a>
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index cf51a6ac..0aa0afeb 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:343px;height:392px;" version="1.1" viewBox="0 0 343 392" width="343px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1j86l0bag2yk1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3u622q486rwx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,35 +9,35 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3u622q486rwx)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="298.2969" y2="298.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="290.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L21" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L21" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L21" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L21" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3u622q486rwx)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="217" y1="54.5769" y2="54.5769"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="179" y="47.2751">ns3</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="69.572">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L23" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3u622q486rwx)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="130.2969" y2="130.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="122.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3u622q486rwx)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="325.9951">ns2_v1_0_0</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L10" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L10" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L10" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L10" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3u622q486rwx)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="325.9951">ns2_v0_9_0</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="53" y="348.292">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1j86l0bag2yk1)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L23" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30003/t30003.cc#L23" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3u622q486rwx)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="157.9951">ns2</text>
     </a>
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 04e57506..fb8d365e 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qel845y3q059" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1nxe90argiuza" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#f1qel845y3q059)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#f1nxe90argiuza)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
     </a>
-    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1nxe90argiuza)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M325,186 L325,196 L335,196 L325,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="231" y="203.0669">Package AAA.</text>
-    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1nxe90argiuza)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M566,73 L566,83 L576,83 L566,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="472" y="90.0669">Package BBB.</text>
-    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1nxe90argiuza)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
-    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1qel845y3q059)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1nxe90argiuza)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M335.5,73 L335.5,83 L345.5,83 L335.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="220.5" y="90.0669">We skipped DDD.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qel845y3q059)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1nxe90argiuza)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="130.5" y="73.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qel845y3q059)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1nxe90argiuza)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qel845y3q059)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1nxe90argiuza)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#f1qel845y3q059)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#f1nxe90argiuza)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="374.5" y="186.9951">EEE</text>
     </a>
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index d8093ab3..d18a8636 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:332px;height:402px;" version="1.1" viewBox="0 0 332 402" width="332px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qp1pa3cdunoe" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc0wy2llbtoq1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,48 +9,48 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="98" x2="122" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="102" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L9" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L17" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L9" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L9" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1qp1pa3cdunoe)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L17" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30005/t30005.cc#L17" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fc0wy2llbtoq1)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
     </a>
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 6aee8ee9..09d071cc 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1sizjfq13zh71" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fr7vdl7i5pl9c" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sizjfq13zh71)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fr7vdl7i5pl9c)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sizjfq13zh71)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30006/t30006.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30006/t30006.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fr7vdl7i5pl9c)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="115.2969" y2="115.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="107.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30006/t30006.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1sizjfq13zh71)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30006/t30006.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30006/t30006.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fr7vdl7i5pl9c)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
     </a>
-    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#f1sizjfq13zh71)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#fr7vdl7i5pl9c)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M91,8 L91,18 L101,18 L91,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="13" y="25.0669">Top A note.</text>
     <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN988-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 638284d5..2b90a795 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1rya9y1fl1da2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8hm60olchyva" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,27 +9,27 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8hm60olchyva)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.5" y1="79.2969" y2="79.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="104.5" y="71.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8hm60olchyva)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.5" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="186.5" y="227.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L11" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L11" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L11" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L11" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8hm60olchyva)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.5" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="147.5" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30007/t30007.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1rya9y1fl1da2)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30007/t30007.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8hm60olchyva)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
     </a>
-    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#f1rya9y1fl1da2)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#f8hm60olchyva)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M201,8 L201,18 L211,18 L201,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="12" y="25.0669">Compare layout with t30006.</text>
     <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1000-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index 2110d401..b0638b65 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pk34sixkccfa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fn9h9z6rhh5rs" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L24" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L24" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L24" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L24" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L32" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L32" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L32" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L32" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L37" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t30008/t30008.cc#L37" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1pk34sixkccfa)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L37" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t30008/t30008.cc#L37" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fn9h9z6rhh5rs)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
     </a>
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index 30988840..881ecdfb 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="377px" preserveAspectRatio="none" style="width:676px;height:377px;" version="1.1" viewBox="0 0 676 377" width="676px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fknffhuqo0kcf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxnelt3432q8k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fknffhuqo0kcf)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxnelt3432q8k)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fknffhuqo0kcf)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxnelt3432q8k)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="157.2969" y2="157.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="149.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fknffhuqo0kcf)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxnelt3432q8k)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="252.2969" y2="252.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="244.9951">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxnelt3432q8k)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M283,59 L283,69 L293,69 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="81.9951">t40001.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxnelt3432q8k)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M185.5,170 L185.5,180 L195.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="192.9951">t40001_include1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxnelt3432q8k)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M144.5,273 L144.5,283 L154.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="295.9951">lib1.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fxnelt3432q8k)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M442.5,273 L442.5,283 L452.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="295.9951">string</text>
-    <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fxnelt3432q8k)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M354.5,170 L354.5,180 L364.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="192.9951">vector</text>
-    <polygon fill="#FEFECE" filter="url(#fknffhuqo0kcf)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#fxnelt3432q8k)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M348.5,273 L348.5,283 L358.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="295.9951">yaml-cpp/yaml.h</text>
-    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#fknffhuqo0kcf)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#fxnelt3432q8k)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M644.5,278.5 L644.5,288.5 L654.5,288.5 L644.5,278.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="295.5669">This is a lib1 include dir</text>
-    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#fknffhuqo0kcf)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#fxnelt3432q8k)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M654,175.5 L654,185.5 L664,185.5 L654,175.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="192.5669">This is a t40001_include1.h include file</text>
     <path d="M247.19,95.33 C246.91,123.45 250.93,178.61 284,206 C299.81,219.09 358.52,203.24 376,214 C395.8,226.19 408.53,250.17 415.68,267.94 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index f0e6921c..090258c7 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1815zdic4kpfa" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f2ok3vzdec95p" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,46 +9,46 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f2ok3vzdec95p)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f2ok3vzdec95p)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f2ok3vzdec95p)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f2ok3vzdec95p)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f2ok3vzdec95p)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1815zdic4kpfa)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f2ok3vzdec95p)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f2ok3vzdec95p)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f2ok3vzdec95p)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f2ok3vzdec95p)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f2ok3vzdec95p)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1815zdic4kpfa)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f2ok3vzdec95p)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
     </a>
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index 0fa9fc42..f893732f 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fc8v69utobj4u" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fxdvc0g10x5tj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,66 +9,66 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxdvc0g10x5tj)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxdvc0g10x5tj)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxdvc0g10x5tj)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
-    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxdvc0g10x5tj)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxdvc0g10x5tj)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#fc8v69utobj4u)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fxdvc0g10x5tj)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/8deaf0246bfc19cb4de9c60cc17d9af444d479c1/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#fc8v69utobj4u)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2136ebefb3024486be934c91128367c5836f5008/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fxdvc0g10x5tj)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
     </a>