From 2da497e3930e441fa495a287742fbd9927d78e46 Mon Sep 17 00:00:00 2001
From: Evan Typanski <evan.typanski@corelight.com>
Date: Thu, 17 Oct 2024 15:00:22 -0400
Subject: [PATCH] Encompass child node's location in parent.

Closes #1893

When a child is added with `addChild`, the parent's location should
(generally) span over that child as well. This primarily helps for cases
where a node doesn't have much of a location until it gets children
added - like `AttributeSet`. The locations for those should encompass
all of the attributes within the set. That logic applies for any node
with a child: if it's the child, then its location should reflect that.
---
 hilti/toolchain/include/ast/location.h        |   2 +
 hilti/toolchain/include/ast/meta.h            |   5 +
 hilti/toolchain/include/ast/node.h            |   8 +-
 hilti/toolchain/src/ast/meta.cc               |  43 +++++++
 hilti/toolchain/src/ast/node.cc               |   3 +-
 spicy/toolchain/src/compiler/validator.cc     |   3 +-
 .../Baseline/hilti.ast.basic-module/debug.log | 116 +++++++++---------
 tests/Baseline/hilti.ast.coercion/output      | 116 +++++++++---------
 tests/Baseline/hilti.ast.imported-id/output   | 116 +++++++++---------
 tests/Baseline/hilti.ast.types/output         | 116 +++++++++---------
 .../hilti.expressions.ctor-replacement/output | 116 +++++++++---------
 .../output                                    |   8 +-
 12 files changed, 353 insertions(+), 299 deletions(-)

diff --git a/hilti/toolchain/include/ast/location.h b/hilti/toolchain/include/ast/location.h
index c985514ada..27752ecd95 100644
--- a/hilti/toolchain/include/ast/location.h
+++ b/hilti/toolchain/include/ast/location.h
@@ -43,6 +43,8 @@ class Location {
     auto file() const { return _file.generic_string(); }
     auto from() const { return _from_line; }
     auto to() const { return _to_line; }
+    auto fromChar() const { return _from_character; }
+    auto toChar() const { return _to_character; }
 
     /**
      * Returns a string representation of the location.
diff --git a/hilti/toolchain/include/ast/meta.h b/hilti/toolchain/include/ast/meta.h
index bf80be14c6..84f2d3b768 100644
--- a/hilti/toolchain/include/ast/meta.h
+++ b/hilti/toolchain/include/ast/meta.h
@@ -51,6 +51,11 @@ class Meta {
     void setLocation(Location l) { _location = std::move(l); }
     void setComments(Comments c) { _comments = std::move(c); }
 
+    /**
+     * Creates a new Meta instance whose location encompasses both instances.
+     */
+    Meta combineLocs(const Meta* other) const;
+
     /**
      * Returns true if the location does not equal a default constructed
      * instance.
diff --git a/hilti/toolchain/include/ast/node.h b/hilti/toolchain/include/ast/node.h
index ad8cdb353d..4ca92d4d8d 100644
--- a/hilti/toolchain/include/ast/node.h
+++ b/hilti/toolchain/include/ast/node.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <optional>
 #include <ostream>
-#include <set>
 #include <string>
 #include <unordered_set>
 #include <utility>
@@ -486,7 +485,7 @@ class Node {
      * @param ctx current context in use
      * @param n child node to add; it's ok for this to be null to leave a child slot unset
      */
-    void addChild(ASTContext* ctx, Node* n) {
+    void addChild(ASTContext* ctx, Node* n, bool update_meta = true) {
         if ( ! n ) {
             _children.emplace_back(nullptr);
             return;
@@ -494,8 +493,13 @@ class Node {
 
         n = _newChild(ctx, n);
 
+        // The child should always inherit the parent's location if it doesn't have
+        // one. Otherwise, try to get a more accurate location for nodes with
+        // children. The location should encompass all children, if possible.
         if ( ! n->location() && _meta->location() )
             n->_meta = _meta;
+        else if ( update_meta && _meta->location() && n->location() )
+            setMeta(_meta->combineLocs(n->_meta));
 
         _children.emplace_back(n);
         n->_parent = this;
diff --git a/hilti/toolchain/src/ast/meta.cc b/hilti/toolchain/src/ast/meta.cc
index 9f8b238e88..7ac9685d0d 100644
--- a/hilti/toolchain/src/ast/meta.cc
+++ b/hilti/toolchain/src/ast/meta.cc
@@ -5,3 +5,46 @@
 using namespace hilti;
 
 std::unordered_set<Meta> Meta::_cache;
+
+Meta Meta::combineLocs(const Meta* other) const {
+    if ( location().file() != other->location().file() )
+        return *this;
+
+    // We have to be careful about column numbers when the line changes
+    int from_line = -1;
+    int to_line = -1;
+    int from_character = -1;
+    int to_character = -1;
+
+    // These calculations are weird. The logic:
+    //
+    // 1) If this starts on a line before other, then choose this for the first point
+    // 2) If this and other are same line, choose this if it is a lower column
+    // 3) Otherwise, choose other
+    //
+    // Then the same logic applies to 'to' as well
+    if ( location().from() < other->location().from() ||
+         (location().from() == other->location().from() && location().fromChar() < other->location().fromChar()) ) {
+        from_line = location().from();
+        from_character = location().fromChar();
+    }
+    else {
+        from_line = other->location().from();
+        from_character = other->location().fromChar();
+    }
+
+    if ( location().to() > other->location().to() ||
+         (location().to() == other->location().to() && location().toChar() > other->location().toChar()) ) {
+        to_line = location().to();
+        to_character = location().toChar();
+    }
+    else {
+        to_line = other->location().to();
+        to_character = other->location().toChar();
+    }
+
+    Location loc(location().file(), from_line, to_line, from_character, to_character);
+
+    // Children can keep their own, separate comments. Just use this one's comments.
+    return Meta(loc, _comments);
+}
diff --git a/hilti/toolchain/src/ast/node.cc b/hilti/toolchain/src/ast/node.cc
index faf8609185..6292a8ca1f 100644
--- a/hilti/toolchain/src/ast/node.cc
+++ b/hilti/toolchain/src/ast/node.cc
@@ -149,7 +149,8 @@ Node* node::detail::deepcopy(ASTContext* ctx, Node* n, bool force) {
     auto clone = n->_clone(ctx);
 
     for ( const auto& c : n->children() )
-        clone->addChild(ctx, c); // this will copy the children recursively (because they have a parent already)
+        clone->addChild(ctx, c, /*update_meta=*/false); // this will copy the children recursively
+                                                        // (because they have a parent already)
 
     return clone;
 }
diff --git a/spicy/toolchain/src/compiler/validator.cc b/spicy/toolchain/src/compiler/validator.cc
index c9a029d3a0..9fbf10c70a 100644
--- a/spicy/toolchain/src/compiler/validator.cc
+++ b/spicy/toolchain/src/compiler/validator.cc
@@ -363,8 +363,7 @@ struct VisitorPost : visitor::PreOrder, hilti::validator::VisitorMixIn {
         const bool isAlias = n->type()->print() != n->typeID().str();
         if ( isAlias ) {
             if ( ! n->attributes()->attributes().empty() )
-                // TODO(#1893): This should diagnose on the attribute set
-                error("attributes are not allow on type aliases", n);
+                error("attributes are not allow on type aliases", n->attributes());
         }
 
         if ( n->linkage() == hilti::declaration::Linkage::Public && n->type()->alias() ) {
diff --git a/tests/Baseline/hilti.ast.basic-module/debug.log b/tests/Baseline/hilti.ast.basic-module/debug.log
index d84b03a03f..98ea77b22b 100644
--- a/tests/Baseline/hilti.ast.basic-module/debug.log
+++ b/tests/Baseline/hilti.ast.basic-module/debug.log
@@ -101,8 +101,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:8:24-8:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:8:31-8:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::integer::BitOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -155,8 +155,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:9:25-9:59) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:9:32-9:37) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::ByteOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -200,8 +200,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:10:20-10:45) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:10:27-10:30) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Side"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -236,8 +236,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:11:29-11:47) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:11:36-11:39) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::AddressFamily"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -272,8 +272,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:12:24-12:62) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:12:31-12:44) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::real::Type"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -317,8 +317,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:13:24-13:46) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:13:31-13:33) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Protocol"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -353,8 +353,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:14:23-14:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:14:30-14:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Charset"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -398,8 +398,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:15:35-15:66) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:15:42-15:47) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::DecodeErrorStrategy"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -451,8 +451,8 @@
 [debug/ast-final]                     - AttributeSet [parent @d:XXX] (hilti.hlt:20:47-20:46) [@a:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:20:48-20:47) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::regexp::MatchState"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -487,8 +487,8 @@
 [debug/ast-final]                 - type::UnsignedInteger <declaration="-" type="-" unified="uint64" width="64" wildcard="false"> [parent @q:XXX] (hilti.hlt:27:5-27:12) (resolved) [@t:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:27:28-27:27) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::stream::Statistics"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -515,8 +515,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:30:51-30:54) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:30:55-30:54) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -545,8 +545,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:31:60-31:63) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:31:64-31:63) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::printValues"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -572,8 +572,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:33:53-33:52) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -593,8 +593,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:34:50-34:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::indent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -614,8 +614,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:35:50-35:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::dedent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -629,8 +629,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:37:16-37:19) [@q:XXX]
 [debug/ast-final]                 - type::Time <declaration="-" type="-" unified="time" wildcard="false"> [parent @q:XXX] (hilti.hlt:37:16-37:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::current_time"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -680,8 +680,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:38:98-38:97) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::mktime"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -695,8 +695,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:40:16-40:19) [@q:XXX]
 [debug/ast-final]                 - type::Void <declaration="-" type="-" unified="void" wildcard="false"> [parent @q:XXX] (hilti.hlt:40:16-40:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::abort_with_backtrace"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -736,8 +736,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:42:93-42:92) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::start"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -777,8 +777,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:43:87-43:86) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::stop"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -789,8 +789,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:46:25-46:33) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D15" type="T13" unified="exception" wildcard="false"> [parent @q:XXX] (hilti.hlt:46:25-46:33) (resolved) [@t:XXX]
 [debug/ast-final]             - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -799,8 +799,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:49:31-49:53) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D16" type="T14" unified="name(hilti::SystemException)" wildcard="false"> [parent @q:XXX] (hilti.hlt:49:31-49:53) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:49:44-49:52) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::std::exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -809,8 +809,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:53:28-53:50) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D17" type="-" unified="name(hilti::RuntimeError)" wildcard="false"> [parent @q:XXX] (hilti.hlt:53:28-53:50) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:53:41-53:49) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RuntimeError"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -819,8 +819,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:56:34-56:56) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D18" type="T15" unified="name(hilti::RecoverableFailure)" wildcard="false"> [parent @q:XXX] (hilti.hlt:56:34-56:56) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:56:47-56:55) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RecoverableFailure"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -829,8 +829,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:59:27-59:49) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D19" type="-" unified="name(hilti::MissingData)" wildcard="false"> [parent @q:XXX] (hilti.hlt:59:27-59:49) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:59:40-59:48) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::MissingData"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -848,8 +848,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:62:59-62:58) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -869,8 +869,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:63:62-63:61) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -890,8 +890,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:66:60-66:59) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -911,8 +911,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:67:63-67:62) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
diff --git a/tests/Baseline/hilti.ast.coercion/output b/tests/Baseline/hilti.ast.coercion/output
index 3969875ac5..28ed71bd8f 100644
--- a/tests/Baseline/hilti.ast.coercion/output
+++ b/tests/Baseline/hilti.ast.coercion/output
@@ -266,8 +266,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:8:24-8:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:8:31-8:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::integer::BitOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -320,8 +320,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:9:25-9:59) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:9:32-9:37) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::ByteOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -365,8 +365,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:10:20-10:45) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:10:27-10:30) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Side"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -401,8 +401,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:11:29-11:47) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:11:36-11:39) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::AddressFamily"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -437,8 +437,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:12:24-12:62) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:12:31-12:44) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::real::Type"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -482,8 +482,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:13:24-13:46) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:13:31-13:33) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Protocol"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -518,8 +518,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:14:23-14:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:14:30-14:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Charset"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -563,8 +563,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:15:35-15:66) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:15:42-15:47) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::DecodeErrorStrategy"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -616,8 +616,8 @@
 [debug/ast-final]                     - AttributeSet [parent @d:XXX] (hilti.hlt:20:47-20:46) [@a:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:20:48-20:47) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::regexp::MatchState"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -652,8 +652,8 @@
 [debug/ast-final]                 - type::UnsignedInteger <declaration="-" type="-" unified="uint64" width="64" wildcard="false"> [parent @q:XXX] (hilti.hlt:27:5-27:12) (resolved) [@t:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:27:28-27:27) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::stream::Statistics"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -680,8 +680,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:30:51-30:54) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:30:55-30:54) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -710,8 +710,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:31:60-31:63) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:31:64-31:63) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::printValues"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -737,8 +737,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:33:53-33:52) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -758,8 +758,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:34:50-34:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::indent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -779,8 +779,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:35:50-35:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::dedent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -794,8 +794,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:37:16-37:19) [@q:XXX]
 [debug/ast-final]                 - type::Time <declaration="-" type="-" unified="time" wildcard="false"> [parent @q:XXX] (hilti.hlt:37:16-37:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::current_time"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -845,8 +845,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:38:98-38:97) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::mktime"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -860,8 +860,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:40:16-40:19) [@q:XXX]
 [debug/ast-final]                 - type::Void <declaration="-" type="-" unified="void" wildcard="false"> [parent @q:XXX] (hilti.hlt:40:16-40:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::abort_with_backtrace"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -901,8 +901,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:42:93-42:92) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::start"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -942,8 +942,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:43:87-43:86) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::stop"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -954,8 +954,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:46:25-46:33) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D15" type="T13" unified="exception" wildcard="false"> [parent @q:XXX] (hilti.hlt:46:25-46:33) (resolved) [@t:XXX]
 [debug/ast-final]             - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -964,8 +964,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:49:31-49:53) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D16" type="T14" unified="name(hilti::SystemException)" wildcard="false"> [parent @q:XXX] (hilti.hlt:49:31-49:53) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:49:44-49:52) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::std::exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -974,8 +974,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:53:28-53:50) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D17" type="-" unified="name(hilti::RuntimeError)" wildcard="false"> [parent @q:XXX] (hilti.hlt:53:28-53:50) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:53:41-53:49) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RuntimeError"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -984,8 +984,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:56:34-56:56) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D18" type="T15" unified="name(hilti::RecoverableFailure)" wildcard="false"> [parent @q:XXX] (hilti.hlt:56:34-56:56) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:56:47-56:55) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RecoverableFailure"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -994,8 +994,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:59:27-59:49) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D19" type="-" unified="name(hilti::MissingData)" wildcard="false"> [parent @q:XXX] (hilti.hlt:59:27-59:49) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:59:40-59:48) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::MissingData"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1013,8 +1013,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:62:59-62:58) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1034,8 +1034,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:63:62-63:61) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1055,8 +1055,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:66:60-66:59) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1076,8 +1076,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:67:63-67:62) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
diff --git a/tests/Baseline/hilti.ast.imported-id/output b/tests/Baseline/hilti.ast.imported-id/output
index ad8b8d5c08..f595de4628 100644
--- a/tests/Baseline/hilti.ast.imported-id/output
+++ b/tests/Baseline/hilti.ast.imported-id/output
@@ -459,8 +459,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:8:24-8:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:8:31-8:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::integer::BitOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -513,8 +513,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:9:25-9:59) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:9:32-9:37) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::ByteOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -558,8 +558,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:10:20-10:45) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:10:27-10:30) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Side"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -594,8 +594,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:11:29-11:47) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:11:36-11:39) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::AddressFamily"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -630,8 +630,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:12:24-12:62) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:12:31-12:44) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::real::Type"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -675,8 +675,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:13:24-13:46) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:13:31-13:33) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Protocol"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -711,8 +711,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:14:23-14:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:14:30-14:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Charset"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -756,8 +756,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:15:35-15:66) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:15:42-15:47) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::DecodeErrorStrategy"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -809,8 +809,8 @@
 [debug/ast-final]                     - AttributeSet [parent @d:XXX] (hilti.hlt:20:47-20:46) [@a:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:20:48-20:47) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::regexp::MatchState"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -845,8 +845,8 @@
 [debug/ast-final]                 - type::UnsignedInteger <declaration="-" type="-" unified="uint64" width="64" wildcard="false"> [parent @q:XXX] (hilti.hlt:27:5-27:12) (resolved) [@t:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:27:28-27:27) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::stream::Statistics"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -873,8 +873,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:30:51-30:54) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:30:55-30:54) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -903,8 +903,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:31:60-31:63) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:31:64-31:63) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::printValues"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -930,8 +930,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:33:53-33:52) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -951,8 +951,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:34:50-34:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::indent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -972,8 +972,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:35:50-35:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::dedent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -987,8 +987,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:37:16-37:19) [@q:XXX]
 [debug/ast-final]                 - type::Time <declaration="-" type="-" unified="time" wildcard="false"> [parent @q:XXX] (hilti.hlt:37:16-37:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::current_time"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1038,8 +1038,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:38:98-38:97) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::mktime"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1053,8 +1053,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:40:16-40:19) [@q:XXX]
 [debug/ast-final]                 - type::Void <declaration="-" type="-" unified="void" wildcard="false"> [parent @q:XXX] (hilti.hlt:40:16-40:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::abort_with_backtrace"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1094,8 +1094,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:42:93-42:92) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::start"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1135,8 +1135,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:43:87-43:86) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::stop"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1147,8 +1147,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:46:25-46:33) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D15" type="T14" unified="exception" wildcard="false"> [parent @q:XXX] (hilti.hlt:46:25-46:33) (resolved) [@t:XXX]
 [debug/ast-final]             - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1157,8 +1157,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:49:31-49:53) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D16" type="T15" unified="name(hilti::SystemException)" wildcard="false"> [parent @q:XXX] (hilti.hlt:49:31-49:53) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T14" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:49:44-49:52) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::std::exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1167,8 +1167,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:53:28-53:50) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D17" type="-" unified="name(hilti::RuntimeError)" wildcard="false"> [parent @q:XXX] (hilti.hlt:53:28-53:50) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T14" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:53:41-53:49) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RuntimeError"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1177,8 +1177,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:56:34-56:56) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D18" type="T16" unified="name(hilti::RecoverableFailure)" wildcard="false"> [parent @q:XXX] (hilti.hlt:56:34-56:56) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T14" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:56:47-56:55) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RecoverableFailure"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1187,8 +1187,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:59:27-59:49) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D19" type="-" unified="name(hilti::MissingData)" wildcard="false"> [parent @q:XXX] (hilti.hlt:59:27-59:49) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T14" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:59:40-59:48) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::MissingData"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1206,8 +1206,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:62:59-62:58) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1227,8 +1227,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:63:62-63:61) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1248,8 +1248,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:66:60-66:59) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -1269,8 +1269,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:67:63-67:62) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
diff --git a/tests/Baseline/hilti.ast.types/output b/tests/Baseline/hilti.ast.types/output
index b0cd206d83..ebab88eda5 100644
--- a/tests/Baseline/hilti.ast.types/output
+++ b/tests/Baseline/hilti.ast.types/output
@@ -139,8 +139,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:8:24-8:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:8:31-8:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::integer::BitOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -193,8 +193,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:9:25-9:59) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:9:32-9:37) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::ByteOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -238,8 +238,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:10:20-10:45) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:10:27-10:30) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Side"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -274,8 +274,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:11:29-11:47) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:11:36-11:39) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::AddressFamily"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -310,8 +310,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:12:24-12:62) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:12:31-12:44) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::real::Type"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -355,8 +355,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:13:24-13:46) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:13:31-13:33) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Protocol"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -391,8 +391,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:14:23-14:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:14:30-14:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Charset"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -436,8 +436,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:15:35-15:66) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:15:42-15:47) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::DecodeErrorStrategy"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -489,8 +489,8 @@
 [debug/ast-final]                     - AttributeSet [parent @d:XXX] (hilti.hlt:20:47-20:46) [@a:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:20:48-20:47) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::regexp::MatchState"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -525,8 +525,8 @@
 [debug/ast-final]                 - type::UnsignedInteger <declaration="-" type="-" unified="uint64" width="64" wildcard="false"> [parent @q:XXX] (hilti.hlt:27:5-27:12) (resolved) [@t:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:27:28-27:27) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::stream::Statistics"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -553,8 +553,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:30:51-30:54) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:30:55-30:54) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -583,8 +583,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:31:60-31:63) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:31:64-31:63) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::printValues"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -610,8 +610,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:33:53-33:52) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -631,8 +631,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:34:50-34:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::indent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -652,8 +652,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:35:50-35:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::dedent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -667,8 +667,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:37:16-37:19) [@q:XXX]
 [debug/ast-final]                 - type::Time <declaration="-" type="-" unified="time" wildcard="false"> [parent @q:XXX] (hilti.hlt:37:16-37:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::current_time"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -718,8 +718,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:38:98-38:97) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::mktime"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -733,8 +733,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:40:16-40:19) [@q:XXX]
 [debug/ast-final]                 - type::Void <declaration="-" type="-" unified="void" wildcard="false"> [parent @q:XXX] (hilti.hlt:40:16-40:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::abort_with_backtrace"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -774,8 +774,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:42:93-42:92) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::start"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -815,8 +815,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:43:87-43:86) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::stop"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -827,8 +827,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:46:25-46:33) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D14" type="T13" unified="exception" wildcard="false"> [parent @q:XXX] (hilti.hlt:46:25-46:33) (resolved) [@t:XXX]
 [debug/ast-final]             - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -837,8 +837,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:49:31-49:53) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D15" type="T14" unified="name(hilti::SystemException)" wildcard="false"> [parent @q:XXX] (hilti.hlt:49:31-49:53) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:49:44-49:52) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::std::exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -847,8 +847,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:53:28-53:50) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D16" type="-" unified="name(hilti::RuntimeError)" wildcard="false"> [parent @q:XXX] (hilti.hlt:53:28-53:50) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:53:41-53:49) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RuntimeError"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -857,8 +857,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:56:34-56:56) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D17" type="T15" unified="name(hilti::RecoverableFailure)" wildcard="false"> [parent @q:XXX] (hilti.hlt:56:34-56:56) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:56:47-56:55) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RecoverableFailure"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -867,8 +867,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:59:27-59:49) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D18" type="-" unified="name(hilti::MissingData)" wildcard="false"> [parent @q:XXX] (hilti.hlt:59:27-59:49) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:59:40-59:48) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::MissingData"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -886,8 +886,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:62:59-62:58) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -907,8 +907,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:63:62-63:61) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -928,8 +928,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:66:60-66:59) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -949,8 +949,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:67:63-67:62) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
diff --git a/tests/Baseline/hilti.expressions.ctor-replacement/output b/tests/Baseline/hilti.expressions.ctor-replacement/output
index 649b3c54e1..91eee317be 100644
--- a/tests/Baseline/hilti.expressions.ctor-replacement/output
+++ b/tests/Baseline/hilti.expressions.ctor-replacement/output
@@ -95,8 +95,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:8:24-8:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:8:31-8:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:8:43-8:82) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::integer::BitOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -149,8 +149,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:9:25-9:59) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:9:32-9:37) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:59) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:9:60-9:91) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::ByteOrder"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -194,8 +194,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:10:20-10:45) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:10:27-10:30) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:45) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:10:46-10:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Side"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -230,8 +230,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:11:29-11:47) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:11:36-11:39) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:47) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:11:48-11:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::AddressFamily"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -266,8 +266,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:12:24-12:62) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:12:31-12:44) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:62) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:12:63-12:95) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::real::Type"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -311,8 +311,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:13:24-13:46) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:13:31-13:33) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:46) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:13:47-13:77) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Protocol"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -347,8 +347,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:14:23-14:42) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:14:30-14:34) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:42) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:14:43-14:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::Charset"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -392,8 +392,8 @@
 [debug/ast-final]                   - type::enum_::Label <id="Undef" value="-1"> [parent @c:XXX] (hilti.hlt:15:35-15:66) [@t:XXX]
 [debug/ast-final]                     - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:15:42-15:47) [@q:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:66) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:15:67-15:115) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::bytes::DecodeErrorStrategy"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -445,8 +445,8 @@
 [debug/ast-final]                     - AttributeSet [parent @d:XXX] (hilti.hlt:20:47-20:46) [@a:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:20:48-20:47) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:21:2-21:42) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::regexp::MatchState"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -481,8 +481,8 @@
 [debug/ast-final]                 - type::UnsignedInteger <declaration="-" type="-" unified="uint64" width="64" wildcard="false"> [parent @q:XXX] (hilti.hlt:27:5-27:12) (resolved) [@t:XXX]
 [debug/ast-final]               - AttributeSet [parent @d:XXX] (hilti.hlt:27:28-27:27) [@a:XXX]
 [debug/ast-final]               - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:1) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:28:2-28:44) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::stream::Statistics"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -509,8 +509,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:30:51-30:54) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:30:55-30:54) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:55) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:30:56-30:99) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -539,8 +539,8 @@
 [debug/ast-final]                       - type::Bool <declaration="-" type="-" unified="bool" wildcard="false"> [parent @q:XXX] (hilti.hlt:31:60-31:63) (resolved) [@t:XXX]
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:31:64-31:63) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:64) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:31:65-31:114) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::printValues"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -566,8 +566,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:33:53-33:52) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:53) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:33:54-33:104) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::print"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -587,8 +587,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:34:50-34:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:34:51-34:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::indent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -608,8 +608,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:35:50-35:49) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:50) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:35:51-35:102) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::debug::dedent"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -623,8 +623,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:37:16-37:19) [@q:XXX]
 [debug/ast-final]                 - type::Time <declaration="-" type="-" unified="time" wildcard="false"> [parent @q:XXX] (hilti.hlt:37:16-37:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:34) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:37:35-37:91) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::current_time"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -674,8 +674,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:38:98-38:97) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:98) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:38:99-38:149) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::time::mktime"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -689,8 +689,8 @@
 [debug/ast-final]               - QualifiedType <const="false" side="rhs"> [parent @t:XXX] (hilti.hlt:40:16-40:19) [@q:XXX]
 [debug/ast-final]                 - type::Void <declaration="-" type="-" unified="void" wildcard="false"> [parent @q:XXX] (hilti.hlt:40:16-40:19) (resolved) [@t:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:27) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:40:28-40:86) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::abort_with_backtrace"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -730,8 +730,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:42:93-42:92) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:93) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:42:94-42:147) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::start"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -771,8 +771,8 @@
 [debug/ast-final]                       - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:43:87-43:86) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:87) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:43:88-43:140) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::profiler::stop"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -783,8 +783,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:46:25-46:33) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D14" type="T13" unified="exception" wildcard="false"> [parent @q:XXX] (hilti.hlt:46:25-46:33) (resolved) [@t:XXX]
 [debug/ast-final]             - <empty>
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:33) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:46:34-46:65) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::Exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -793,8 +793,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:49:31-49:53) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D15" type="T14" unified="name(hilti::SystemException)" wildcard="false"> [parent @q:XXX] (hilti.hlt:49:31-49:53) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:49:44-49:52) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:53) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:49:54-49:79) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::std::exception"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -803,8 +803,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:53:28-53:50) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D16" type="-" unified="name(hilti::RuntimeError)" wildcard="false"> [parent @q:XXX] (hilti.hlt:53:28-53:50) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:53:41-53:49) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:50) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:53:51-53:85) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RuntimeError"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -813,8 +813,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:56:34-56:56) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D17" type="T15" unified="name(hilti::RecoverableFailure)" wildcard="false"> [parent @q:XXX] (hilti.hlt:56:34-56:56) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:56:47-56:55) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:56) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:56:57-56:97) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::RecoverableFailure"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -823,8 +823,8 @@
 [debug/ast-final]         - QualifiedType <const="false" side="rhs"> [parent @d:XXX] (hilti.hlt:59:27-59:49) [@q:XXX]
 [debug/ast-final]           - type::Exception <declaration="D18" type="-" unified="name(hilti::MissingData)" wildcard="false"> [parent @q:XXX] (hilti.hlt:59:27-59:49) (resolved) [@t:XXX]
 [debug/ast-final]             - type::Name <builtin="false" declaration="-" id="Exception" resolved-type="T13" type="-" unified="exception" wildcard="false"> [parent @t:XXX] (hilti.hlt:59:40-59:48) (resolved) [@t:XXX]
-[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
-[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:49) [@a:XXX]
+[debug/ast-final]         - AttributeSet [parent @d:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
+[debug/ast-final]           - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:59:50-59:83) [@a:XXX]
 [debug/ast-final]             - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]               - ctor::String <is_literal="true" value="::hilti::rt::MissingData"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                 - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -842,8 +842,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:62:59-62:58) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:59) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:62:60-62:113) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -863,8 +863,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:63:62-63:61) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:62) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:63:63-63:116) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::what"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -884,8 +884,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:66:60-66:59) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:60) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:66:61-66:115) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
@@ -905,8 +905,8 @@
 [debug/ast-final]                 - <empty>
 [debug/ast-final]                 - AttributeSet [parent @d:XXX] (hilti.hlt:67:63-67:62) [@a:XXX]
 [debug/ast-final]           - <empty>
-[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
-[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:63) [@a:XXX]
+[debug/ast-final]           - AttributeSet [parent @f:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
+[debug/ast-final]             - Attribute <tag="&cxxname"> [parent @a:XXX] (hilti.hlt:67:64-67:118) [@a:XXX]
 [debug/ast-final]               - expression::Ctor [parent @a:XXX]  (const)  (resolved) [@e:XXX]
 [debug/ast-final]                 - ctor::String <is_literal="true" value="::hilti::rt::exception::where"> [parent @e:XXX] [@c:XXX]
 [debug/ast-final]                   - QualifiedType <const="true" side="rhs"> [parent @c:XXX] [@q:XXX]
diff --git a/tests/Baseline/spicy.attributes.invalid-type-attributes/output b/tests/Baseline/spicy.attributes.invalid-type-attributes/output
index f93209e6bd..f7a7092db2 100644
--- a/tests/Baseline/spicy.attributes.invalid-type-attributes/output
+++ b/tests/Baseline/spicy.attributes.invalid-type-attributes/output
@@ -1,6 +1,6 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-[error] <...>/invalid-type-attributes.spicy:11:1-11:23: attributes are not allow on type aliases
-[error] <...>/invalid-type-attributes.spicy:12:1-12:23: attributes are not allow on type aliases
-[error] <...>/invalid-type-attributes.spicy:15:1-15:46: attributes are not allow on type aliases
-[error] <...>/invalid-type-attributes.spicy:16:1-16:53: attributes are not allow on type aliases
+[error] <...>/invalid-type-attributes.spicy:11:17-11:22: attributes are not allow on type aliases
+[error] <...>/invalid-type-attributes.spicy:12:15-12:22: attributes are not allow on type aliases
+[error] <...>/invalid-type-attributes.spicy:15:28-15:45: attributes are not allow on type aliases
+[error] <...>/invalid-type-attributes.spicy:16:20-16:52: attributes are not allow on type aliases
 [error] spicyc: aborting after errors