diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 280ba018b..e71efce2e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -23,26 +23,8 @@ jobs:
       - name: lint
         run: npm run lint
 
-  # test_bundle:
-  #   name: Test production
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - uses: actions/setup-node@v3
-  #       with:
-  #         node-version: 16
-  #         cache: 'npm'
-  #     - name: Install
-  #       run: npm install
-  #     - name: Build
-  #       run: npm run build
-  #     - name: Build test app
-  #       run: npm run build:test
-  #     - name: Run tests
-  #       run: npm run test:standalone
-
-  test_prettier_v2:
-    name: Prettier V2
+  test_bundle:
+    name: Test production
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -52,14 +34,12 @@ jobs:
           cache: 'npm'
       - name: Install
         run: npm install
-      - name: Build with Prettier V3
+      - name: Build
         run: npm run build
-      - name: Downgrade Prettier to V2
-        run: npm install prettier@2.8.8
-      # - name: Build test app
-      #   run: npm run build:test
-      # - name: Run standalone tests
-      #   run: npm run test:standalone
+      - name: Build test app
+        run: npm run build:test
+      - name: Run tests
+        run: npm run test:standalone -- --runInBand
 
   test_linux:
     name: Test on Linux with Node ${{ matrix.node }}
@@ -76,7 +56,7 @@ jobs:
       - name: Install
         run: npm install
       - name: Run tests
-        run: npm run test:all
+        run: npm run test:all -- --runInBand
 
   test_macos:
     name: Test on MacOS with Node 16
@@ -90,7 +70,7 @@ jobs:
       - name: Install
         run: npm install
       - name: Run tests
-        run: npm run test:all
+        run: npm run test:all -- --runInBand
 
   test_windows:
     name: Test on Windows with Node 16
@@ -104,4 +84,4 @@ jobs:
       - name: Install
         run: npm install
       - name: Run tests
-        run: npm run test:all
+        run: npm run test:all -- --runInBand
diff --git a/README.md b/README.md
index aa8c551f3..b75428beb 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,8 @@ Install both `prettier` and `prettier-plugin-solidity`:
 npm install --save-dev prettier prettier-plugin-solidity
 ```
 
+> :package: ** Make sure `prettier`'s version is at least `3.0.0`**
+
 Run prettier in your contracts:
 
 ```Bash
@@ -46,17 +48,12 @@ Or you can use it as part of your linting to check that all your code is prettif
 
 > Prettier Solidity only works with valid code. If there is a syntax error, nothing will be done and a parser error will be thrown.
 
-### ~~Using in the Browser~~ _Disabled during v2.0.0-beta_
+### Using in the Browser
 
 _Added in v1.1.0_
 
 To use this package in the browser, you need to load Prettier's standalone bundle before loading the build provided in this package.
 
-```html
-<script src="https://unpkg.com/prettier@latest"></script>
-<script src="https://unpkg.com/prettier-plugin-solidity@latest"></script>
-```
-
 Prettier's unpkg field points to `https://unpkg.com/prettier/standalone.js`, in a similar way this plugin points to `https://unpkg.com/prettier-plugin-solidity/dist/standalone.js`.
 
 Once the scripts are loaded you will have access the globals `prettier` and `prettierPlugins`.
@@ -64,7 +61,14 @@ Once the scripts are loaded you will have access the globals `prettier` and `pre
 We follow Prettier's strategy for populating their plugins in the object `prettierPlugins`, you can load other plugins like `https://unpkg.com/prettier@2.8.0/parser-markdown.js` and Prettier will have access to multiple parsers.
 
 ```html
-<script>
+<script type="module">
+  const prettier = await import(
+    'https://unpkg.com/prettier-plugin-solidity@latest'
+  );
+  const prettierSolidity = await import(
+    'https://unpkg.com/prettier-plugin-solidity@latest'
+  );
+
   async function format(code) {
     return await prettier.format(code, {
       parser: 'slang-solidity',
@@ -79,7 +83,7 @@ We follow Prettier's strategy for populating their plugins in the object `pretti
 
 For more details and please have a look at [Prettier's documentation](https://prettier.io/docs/en/browser.html).
 
-### ~~Creating a package for the Browser~~ _Disabled during v2.0.0-beta_
+### Creating a package for the Browser
 
 _Added in v1.2.0_
 
diff --git a/package-lock.json b/package-lock.json
index 2fd5917be..bc3cce7d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,30 +1,31 @@
 {
   "name": "prettier-plugin-solidity",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "prettier-plugin-solidity",
-      "version": "2.0.0-beta.2",
+      "version": "2.0.0-beta.3",
       "license": "MIT",
       "dependencies": {
-        "@nomicfoundation/slang": "0.17.0",
+        "@nomicfoundation/slang": "0.18.3",
         "@solidity-parser/parser": "^0.18.0",
-        "semver": "^7.6.3"
+        "semver": "^7.6.3",
+        "strip-comments": "^2.0.1"
       },
       "devDependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@types/jest": "^29.5.13",
+        "@babel/code-frame": "^7.26.2",
+        "@types/jest": "^29.5.14",
         "@types/semver": "^7.5.8",
-        "@typescript-eslint/eslint-plugin": "^8.8.0",
-        "@typescript-eslint/parser": "^8.8.0",
+        "@types/strip-comments": "^2.0.4",
+        "@typescript-eslint/eslint-plugin": "^8.12.2",
+        "@typescript-eslint/parser": "^8.12.2",
         "c8": "^9.1.0",
         "cross-env": "^7.0.3",
-        "eslint": "^9.11.1",
+        "eslint": "^9.14.0",
         "eslint-config-prettier": "^9.1.0",
         "esm-utils": "^4.3.0",
-        "esmock": "^2.6.7",
         "jest": "^29.7.0",
         "jest-light-runner": "^0.6.0",
         "jest-snapshot-serializer-ansi": "^2.1.0",
@@ -32,19 +33,18 @@
         "jest-watch-typeahead": "^2.2.2",
         "lines-and-columns": "^2.0.4",
         "prettier": "^3.3.3",
-        "proxyquire": "^2.1.3",
-        "solc": "^0.8.27",
+        "solc": "^0.8.28",
         "ts-loader": "^9.5.1",
         "ts-node": "^10.9.2",
-        "typescript": "^5.5.4",
-        "webpack": "^5.95.0",
+        "typescript": "^5.6.3",
+        "webpack": "^5.96.1",
         "webpack-cli": "^5.1.4"
       },
       "engines": {
         "node": ">=16"
       },
       "peerDependencies": {
-        "prettier": ">=2.3.0"
+        "prettier": ">=3.0.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -83,12 +83,14 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -288,10 +290,11 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -319,77 +322,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@babel/highlight/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/parser": {
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
@@ -643,6 +575,12 @@
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
       "dev": true
     },
+    "node_modules/@bytecodealliance/preview2-shim": {
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.17.0.tgz",
+      "integrity": "sha512-JorcEwe4ud0x5BS/Ar2aQWOQoFzjq/7jcnxYXCvSMh0oRm0dQXzOA+hqLDBnOMks1LLBA7dmiLLsEBl09Yd6iQ==",
+      "license": "(Apache-2.0 WITH LLVM-exception)"
+    },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -692,9 +630,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -717,9 +655,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.6.0.tgz",
-      "integrity": "sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.7.0.tgz",
+      "integrity": "sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -751,9 +689,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.1.tgz",
-      "integrity": "sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==",
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.14.0.tgz",
+      "integrity": "sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -783,6 +721,44 @@
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.6",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -797,9 +773,9 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
-      "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.0.tgz",
+      "integrity": "sha512-xnRgu9DxZbkWak/te3fcytNyp8MTbuiZIaueg2rgEvBuN55n04nwLYLU9TX/VVlusc9L2ZNXi99nUFNkHXtr5g==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1321,104 +1297,12 @@
       }
     },
     "node_modules/@nomicfoundation/slang": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-0.17.0.tgz",
-      "integrity": "sha512-1GlkGRcGpVnjFw9Z1vvDKOKo2mzparFt7qrl2pDxWp+jrVtlvej98yCMX52pVyrYE7ZeOSZFnx/DtsSgoukStQ==",
+      "version": "0.18.3",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang/-/slang-0.18.3.tgz",
+      "integrity": "sha512-YqAWgckqbHM0/CZxi9Nlf4hjk9wUNLC9ngWCWBiqMxPIZmzsVKYuChdlrfeBPQyvQQBoOhbx+7C1005kLVQDZQ==",
       "license": "MIT",
       "dependencies": {
-        "@nomicfoundation/slang-darwin-arm64": "0.17.0",
-        "@nomicfoundation/slang-darwin-x64": "0.17.0",
-        "@nomicfoundation/slang-linux-arm64-gnu": "0.17.0",
-        "@nomicfoundation/slang-linux-arm64-musl": "0.17.0",
-        "@nomicfoundation/slang-linux-x64-gnu": "0.17.0",
-        "@nomicfoundation/slang-linux-x64-musl": "0.17.0",
-        "@nomicfoundation/slang-win32-arm64-msvc": "0.17.0",
-        "@nomicfoundation/slang-win32-ia32-msvc": "0.17.0",
-        "@nomicfoundation/slang-win32-x64-msvc": "0.17.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-darwin-arm64": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-darwin-arm64/-/slang-darwin-arm64-0.17.0.tgz",
-      "integrity": "sha512-O0q94EUtoWy9A5kOTOa9/khtxXDYnLqmuda9pQELurSiwbQEVCPQL8kb34VbOW+ifdre66JM/05Xw9JWhIZ9sA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-darwin-x64": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-darwin-x64/-/slang-darwin-x64-0.17.0.tgz",
-      "integrity": "sha512-IaDbHzvT08sBK2HyGzonWhq1uu8IxdjmTqAWHr25Oh/PYnamdi8u4qchZXXYKz/DHLoYN3vIpBXoqLQIomhD/g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-linux-arm64-gnu": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-linux-arm64-gnu/-/slang-linux-arm64-gnu-0.17.0.tgz",
-      "integrity": "sha512-Lj4anvOsQZxs1SycG8VyT2Rl2oqIhyLSUCgGepTt3CiJ/bM+8r8bLJIgh8vKkki4BWz49YsYIgaJB2IPv8FFTw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-linux-arm64-musl": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-linux-arm64-musl/-/slang-linux-arm64-musl-0.17.0.tgz",
-      "integrity": "sha512-/xkTCa9d5SIWUBQE3BmLqDFfJRr4yUBwbl4ynPiGUpRXrD69cs6pWKkwjwz/FdBpXqVo36I+zY95qzoTj/YhOA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-linux-x64-gnu": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-linux-x64-gnu/-/slang-linux-x64-gnu-0.17.0.tgz",
-      "integrity": "sha512-oe5IO5vntOqYvTd67deCHPIWuSuWm6aYtT2/0Kqz2/VLtGz4ClEulBSRwfnNzBVtw2nksWipE1w8BzhImI7Syg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-linux-x64-musl": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-linux-x64-musl/-/slang-linux-x64-musl-0.17.0.tgz",
-      "integrity": "sha512-PpYCI5K/kgLAMXaPY0V4VST5gCDprEOh7z/47tbI8kJQumI5odjsj/Cs8MpTo7/uRH6flKYbVNgUzcocWVYrAQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-win32-arm64-msvc": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-win32-arm64-msvc/-/slang-win32-arm64-msvc-0.17.0.tgz",
-      "integrity": "sha512-u/Mkf7OjokdBilP7QOJj6QYJU4/mjkbKnTX21wLyCIzeVWS7yafRPYpBycKIBj2pRRZ6ceAY5EqRpb0aiCq+0Q==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-win32-ia32-msvc": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-win32-ia32-msvc/-/slang-win32-ia32-msvc-0.17.0.tgz",
-      "integrity": "sha512-XJBVQfNnZQUv0tP2JSJ573S+pmgrLWgqSZOGaMllnB/TL1gRci4Z7dYRJUF2s82GlRJE+FHSI2Ro6JISKmlXCg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@nomicfoundation/slang-win32-x64-msvc": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/slang-win32-x64-msvc/-/slang-win32-x64-msvc-0.17.0.tgz",
-      "integrity": "sha512-zPGsAeiTfqfPNYHD8BfrahQmYzA78ZraoHKTGraq/1xwJwzBK4bu/NtvVA4pJjBV+B4L6DCxVhSbpn40q26JQA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10"
+        "@bytecodealliance/preview2-shim": "0.17.0"
       }
     },
     "node_modules/@pkgr/utils": {
@@ -1470,6 +1354,248 @@
       "resolved": "https://registry.npmjs.org/@solidity-parser/parser/-/parser-0.18.0.tgz",
       "integrity": "sha512-yfORGUIPgLck41qyN7nbwJRAx17/jAIXCTanHOJZhB6PJ1iAk/84b/xlsVKFSyNyLXIj0dhppoE0+CRws7wlzA=="
     },
+    "node_modules/@swc/core": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.7.36.tgz",
+      "integrity": "sha512-bu7ymMX+LCJOSSrKank25Jaq66ymLVA9fOUuy4ck3/6rbXdLw+pIJPnIDKQ9uNcxww8KDxOuJk9Ui9pqR+aGFw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@swc/counter": "^0.1.3",
+        "@swc/types": "^0.1.13"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/swc"
+      },
+      "optionalDependencies": {
+        "@swc/core-darwin-arm64": "1.7.36",
+        "@swc/core-darwin-x64": "1.7.36",
+        "@swc/core-linux-arm-gnueabihf": "1.7.36",
+        "@swc/core-linux-arm64-gnu": "1.7.36",
+        "@swc/core-linux-arm64-musl": "1.7.36",
+        "@swc/core-linux-x64-gnu": "1.7.36",
+        "@swc/core-linux-x64-musl": "1.7.36",
+        "@swc/core-win32-arm64-msvc": "1.7.36",
+        "@swc/core-win32-ia32-msvc": "1.7.36",
+        "@swc/core-win32-x64-msvc": "1.7.36"
+      },
+      "peerDependencies": {
+        "@swc/helpers": "*"
+      },
+      "peerDependenciesMeta": {
+        "@swc/helpers": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.7.36.tgz",
+      "integrity": "sha512-8vDczXzCgv3ceTPhEivlpGprN44YlrCK1nbfU9g2TrhV/Aiqi09W/eM5zLesdoM1Z3mJl492gc/8nlTkpDdusw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.7.36.tgz",
+      "integrity": "sha512-Pa2Gao7+Wf5m3SsK4abKRtd48AtoUnJInvaC3d077swBfgZjbjUbQvcpdc2dOeQtWwo49rFqUZJonMsL0jnPgQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.7.36.tgz",
+      "integrity": "sha512-3YsMWd7V+WZEjbfBnLkkz/olcRBa8nyoK0iIOnNARJBMcYaJxjkJSMZpmSojCnIVwvjA1N83CPAbUL+W+fCnHg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.7.36.tgz",
+      "integrity": "sha512-lqM3aBB7kJazJYOwHeA5OGNLqXoQPZ/76b3dV+XcjN1GhD0CcXz6mW5PRYVin6OSN1eKrKBKJjtDA1mqADDEvw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.7.36.tgz",
+      "integrity": "sha512-bqei2YDzvUfG0pth5W2xJaj0eG4XWYk0d/NJ75vBX6bkIzK6dC8iuKQ41jOfUWonnrAs7rTDDJW0sTn/evvRdw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.7.36.tgz",
+      "integrity": "sha512-03maXTUyaBjeCxlDltmdzHje1ryQt1C4OWmmNgSSRXjLb+GNnAenwOJMSrcvHP/aNClD2pwsFCnYKDGy+sYE6w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-musl": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.7.36.tgz",
+      "integrity": "sha512-XXysqLkvjtQnXm1zHqLhy00UYPv/gk5OtwR732X+piNisnEbcJBqI8Qp9O7YvLWllRcoP8IMBGDWLGdGLSpViA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.7.36.tgz",
+      "integrity": "sha512-k7+dmb13a/zPw+E4XYfPmLZFWJgcOcBRKIjYl9nQErtYsgsg3Ji6TBbsvJVETy23lNHyewZ17V5Vq6NzaG0hzg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.7.36.tgz",
+      "integrity": "sha512-ridD3ay6YM2PEYHZXXFN+edYEv0FOynaqOBP+NSnGNHA35azItIjoIe+KNi4WltGtAjpKCHSpjGCNfna12wdYQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.7.36",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.7.36.tgz",
+      "integrity": "sha512-j1z2Z1Ln9d0E3dHsPkC1K9XDh0ojhRPwV+GfRTu4D61PE+aYhYLvbJC6xPvL4/204QrStRS7eDu3m+BcDp3rgQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/@swc/types": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.13.tgz",
+      "integrity": "sha512-JL7eeCk6zWCbiYQg2xQSdLXQJl8Qoc9rXmG2cEKvHe3CKwMHwHGpfOb8frzNLmbycOo6I51qxnLnn9ESf4I20Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@swc/counter": "^0.1.3"
+      }
+    },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
@@ -1539,6 +1665,28 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/eslint": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+      "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -1580,10 +1728,11 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.13",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.13.tgz",
-      "integrity": "sha512-wd+MVEZCHt23V0/L642O5APvspWply/rGY5BcW4SUETo2UzPU3Z26qr8jC2qxpimI2jjx9h7+2cj2FwIr01bXg==",
+      "version": "29.5.14",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expect": "^29.0.0",
         "pretty-format": "^29.0.0"
@@ -1615,6 +1764,13 @@
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
+    "node_modules/@types/strip-comments": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/strip-comments/-/strip-comments-2.0.4.tgz",
+      "integrity": "sha512-YwcQqIGy90zEHrReYrMTpZfq003Um77WayeE8UwJTHvaM9g9XR9N7GMVSnjRhhDzQYVX375JnB5P6q5kAg221g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/yargs": {
       "version": "17.0.17",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.17.tgz",
@@ -1631,17 +1787,17 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.8.0.tgz",
-      "integrity": "sha512-wORFWjU30B2WJ/aXBfOm1LX9v9nyt9D3jsSOxC3cCaTQGCW5k4jNpmjFv3U7p/7s4yvdjHzwtv2Sd2dOyhjS0A==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
+      "integrity": "sha512-gQxbxM8mcxBwaEmWdtLCIGLfixBMHhQjBqR8sVWNTPpcj45WlYL2IObS/DNMLH1DBP0n8qz+aiiLTGfopPEebw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.8.0",
-        "@typescript-eslint/type-utils": "8.8.0",
-        "@typescript-eslint/utils": "8.8.0",
-        "@typescript-eslint/visitor-keys": "8.8.0",
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/type-utils": "8.12.2",
+        "@typescript-eslint/utils": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -1665,16 +1821,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.8.0.tgz",
-      "integrity": "sha512-uEFUsgR+tl8GmzmLjRqz+VrDv4eoaMqMXW7ruXfgThaAShO9JTciKpEsB+TvnfFfbg5IpujgMXVV36gOJRLtZg==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.12.2.tgz",
+      "integrity": "sha512-MrvlXNfGPLH3Z+r7Tk+Z5moZAc0dzdVjTgUgwsdGweH7lydysQsnSww3nAmsq8blFuRD5VRlAr9YdEFw3e6PBw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.8.0",
-        "@typescript-eslint/types": "8.8.0",
-        "@typescript-eslint/typescript-estree": "8.8.0",
-        "@typescript-eslint/visitor-keys": "8.8.0",
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1694,14 +1850,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.8.0.tgz",
-      "integrity": "sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.12.2.tgz",
+      "integrity": "sha512-gPLpLtrj9aMHOvxJkSbDBmbRuYdtiEbnvO25bCMza3DhMjTQw0u7Y1M+YR5JPbMsXXnSPuCf5hfq0nEkQDL/JQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.8.0",
-        "@typescript-eslint/visitor-keys": "8.8.0"
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1712,14 +1868,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.8.0.tgz",
-      "integrity": "sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.12.2.tgz",
+      "integrity": "sha512-bwuU4TAogPI+1q/IJSKuD4shBLc/d2vGcRT588q+jzayQyjVK2X6v/fbR4InY2U2sgf8MEvVCqEWUzYzgBNcGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.8.0",
-        "@typescript-eslint/utils": "8.8.0",
+        "@typescript-eslint/typescript-estree": "8.12.2",
+        "@typescript-eslint/utils": "8.12.2",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -1737,9 +1893,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.8.0.tgz",
-      "integrity": "sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.12.2.tgz",
+      "integrity": "sha512-VwDwMF1SZ7wPBUZwmMdnDJ6sIFk4K4s+ALKLP6aIQsISkPv8jhiw65sAK6SuWODN/ix+m+HgbYDkH+zLjrzvOA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1751,14 +1907,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.8.0.tgz",
-      "integrity": "sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.12.2.tgz",
+      "integrity": "sha512-mME5MDwGe30Pq9zKPvyduyU86PH7aixwqYR2grTglAdB+AN8xXQ1vFGpYaUSJ5o5P/5znsSBeNcs5g5/2aQwow==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "8.8.0",
-        "@typescript-eslint/visitor-keys": "8.8.0",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/visitor-keys": "8.12.2",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1806,16 +1962,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.8.0.tgz",
-      "integrity": "sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.12.2.tgz",
+      "integrity": "sha512-UTTuDIX3fkfAz6iSVa5rTuSfWIYZ6ATtEocQ/umkRSyC9O919lbZ8dcH7mysshrCdrAM03skJOEYaBugxN+M6A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.8.0",
-        "@typescript-eslint/types": "8.8.0",
-        "@typescript-eslint/typescript-estree": "8.8.0"
+        "@typescript-eslint/scope-manager": "8.12.2",
+        "@typescript-eslint/types": "8.12.2",
+        "@typescript-eslint/typescript-estree": "8.12.2"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1829,13 +1985,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.8.0.tgz",
-      "integrity": "sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==",
+      "version": "8.12.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.12.2.tgz",
+      "integrity": "sha512-PChz8UaKQAVNHghsHcPyx1OMHoFRUEA7rJSK/mDhdq85bk+PLsUHUBqTQTFt18VJZbmxBovM65fezlheQRsSDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.8.0",
+        "@typescript-eslint/types": "8.12.2",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -2049,9 +2205,9 @@
       "dev": true
     },
     "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -2061,15 +2217,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/acorn-import-attributes": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -2358,9 +2505,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.22.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+      "version": "4.24.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+      "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
       "dev": true,
       "funding": [
         {
@@ -2376,11 +2523,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001565",
-        "electron-to-chromium": "^1.4.601",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "caniuse-lite": "^1.0.30001669",
+        "electron-to-chromium": "^1.5.41",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2463,9 +2611,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001579",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz",
-      "integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==",
+      "version": "1.0.30001676",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001676.tgz",
+      "integrity": "sha512-Qz6zwGCiPghQXGJvgQAem79esjitvJ+CxSbSQkW9H/UX5hg8XM88d4lp2W+MEQ81j+Hip58Il+jGVdazk1z9cw==",
       "dev": true,
       "funding": [
         {
@@ -2480,7 +2628,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "4.1.2",
@@ -2575,21 +2724,6 @@
       "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
       "dev": true
     },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
     "node_modules/colorette": {
       "version": "2.0.19",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
@@ -2914,10 +3048,11 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.645",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.645.tgz",
-      "integrity": "sha512-EeS1oQDCmnYsRDRy2zTeC336a/4LZ6WKqvSaM1jLocEk5ZuyszkQtCpsqvuvaIXGOUjwtvF6LTcS8WueibXvSw==",
-      "dev": true
+      "version": "1.5.50",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.50.tgz",
+      "integrity": "sha512-eMVObiUQ2LdgeO1F/ySTXsvqvxb6ZH2zPGaMYsWzRDdOddUa77tdmI0ltg+L16UpbWdhPmuF3wIQYyQq65WfZw==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/emittery": {
       "version": "0.13.1",
@@ -2973,10 +3108,11 @@
       "dev": true
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2994,22 +3130,22 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.11.1",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.1.tgz",
-      "integrity": "sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==",
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.14.0.tgz",
+      "integrity": "sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.11.0",
+        "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.18.0",
-        "@eslint/core": "^0.6.0",
+        "@eslint/core": "^0.7.0",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "9.11.1",
+        "@eslint/js": "9.14.0",
         "@eslint/plugin-kit": "^0.2.0",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.3.0",
-        "@nodelib/fs.walk": "^1.2.8",
+        "@humanwhocodes/retry": "^0.4.0",
         "@types/estree": "^1.0.6",
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
@@ -3017,9 +3153,9 @@
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.0.2",
-        "eslint-visitor-keys": "^4.0.0",
-        "espree": "^10.1.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
         "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
@@ -3029,13 +3165,11 @@
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "lodash.merge": "^4.6.2",
         "minimatch": "^3.1.2",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
         "text-table": "^0.2.0"
       },
       "bin": {
@@ -3069,9 +3203,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
-      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3098,9 +3232,9 @@
       }
     },
     "node_modules/eslint/node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3123,25 +3257,16 @@
         "url": "https://github.com/fisker/esm-utils?sponsor=1"
       }
     },
-    "node_modules/esmock": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/esmock/-/esmock-2.6.7.tgz",
-      "integrity": "sha512-4DmjZ0qQIG+NQV1njHvWrua/cZEuJq56A3pSELT2BjNuol1aads7BluofCbLErdO41Ic1XCd2UMepVLpjL64YQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=14.16.0"
-      }
-    },
     "node_modules/espree": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
-      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.12.0",
+        "acorn": "^8.14.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.0.0"
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -3151,9 +3276,9 @@
       }
     },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
-      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3361,19 +3486,6 @@
         "node": ">=16.0.0"
       }
     },
-    "node_modules/fill-keys": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
-      "integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
-      "dev": true,
-      "dependencies": {
-        "is-object": "~1.0.1",
-        "merge-descriptors": "~1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -3478,11 +3590,12 @@
       "dev": true
     },
     "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -3845,24 +3958,6 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-      "integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -5391,7 +5486,8 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -5587,12 +5683,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
-      "dev": true
-    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -5664,12 +5754,6 @@
         "node": "*"
       }
     },
-    "node_modules/module-not-found-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
-      "integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
-      "dev": true
-    },
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5695,10 +5779,11 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
@@ -5899,10 +5984,11 @@
       "dev": true
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -6003,7 +6089,6 @@
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
       "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -6053,17 +6138,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/proxyquire": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
-      "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
-      "dev": true,
-      "dependencies": {
-        "fill-keys": "^1.0.2",
-        "module-not-found-error": "^1.0.1",
-        "resolve": "^1.11.1"
-      }
-    },
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -6363,10 +6437,11 @@
       }
     },
     "node_modules/solc": {
-      "version": "0.8.27",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.27.tgz",
-      "integrity": "sha512-BNxMol2tUAbkH7HKlXBcBqrGi2aqgv+uMHz26mJyTtlVgWmBA4ktiw0qVKHfkjf2oaHbwtbtaSeE2dhn/gTAKw==",
+      "version": "0.8.28",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.28.tgz",
+      "integrity": "sha512-AFCiJ+b4RosyyNhnfdVH4ZR1+TxiL91iluPjw0EJslIu4LXGM9NYqi2z5y8TqochC4tcH9QsHfwWhOIC9jPDKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "command-exists": "^1.2.8",
         "commander": "^8.1.0",
@@ -6492,6 +6567,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
+      "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
@@ -6845,9 +6929,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -6868,9 +6952,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "dev": true,
       "funding": [
         {
@@ -6886,9 +6970,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -6959,19 +7044,19 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.95.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-      "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+      "version": "5.96.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "^1.0.5",
+        "@types/eslint-scope": "^3.7.7",
+        "@types/estree": "^1.0.6",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
-        "acorn": "^8.7.1",
-        "acorn-import-attributes": "^1.9.5",
-        "browserslist": "^4.21.10",
+        "acorn": "^8.14.0",
+        "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
         "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
diff --git a/package.json b/package.json
index 2521c8908..c5635b141 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,27 @@
 {
   "name": "prettier-plugin-solidity",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "description": "A Prettier Plugin for automatically formatting your Solidity code.",
   "type": "module",
   "main": "./dist/index.js",
+  "browser": "./dist/standalone.js",
+  "unpkg": "./dist/",
+  "exports": {
+    ".": "./dist/index.js",
+    "./standalone": "./dist/standalone.js"
+  },
   "scripts": {
-    "build": "npx tsc",
+    "build": "webpack --env production",
+    "build:dev": "webpack --env development",
+    "build:test": "webpack --config test.config.js",
     "eslint": "eslint 'src/**' 'tests/**'",
     "lint": "npm run eslint && npm run prettier -- --list-different",
     "lint:fix": "npm run eslint -- --fix && npm run prettier -- --write",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "npm run build && npx tsc",
     "prettier": "prettier './*.{ts,js,cjs,json,md,yml}' '{src,tests}/**/*.{ts,js,cjs}'",
-    "test": "NODE_OPTIONS=\"--loader=ts-node/esm --loader=esmock\" jest",
-    "test:all": "cross-env FULL_TEST=1 NODE_OPTIONS=\"--loader=ts-node/esm --loader=esmock\" c8 jest"
+    "test": "NODE_OPTIONS=\"--loader=ts-node/esm\" jest",
+    "test:all": "cross-env FULL_TEST=1 NODE_OPTIONS=\"--loader=ts-node/esm\" c8 jest",
+    "test:standalone": "cross-env TEST_STANDALONE=1 FULL_TEST=1 jest"
   },
   "files": [
     "src",
@@ -74,17 +83,17 @@
     "node": ">=16"
   },
   "devDependencies": {
-    "@babel/code-frame": "^7.24.7",
-    "@types/jest": "^29.5.13",
+    "@babel/code-frame": "^7.26.2",
+    "@types/jest": "^29.5.14",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^8.8.0",
-    "@typescript-eslint/parser": "^8.8.0",
+    "@types/strip-comments": "^2.0.4",
+    "@typescript-eslint/eslint-plugin": "^8.12.2",
+    "@typescript-eslint/parser": "^8.12.2",
     "c8": "^9.1.0",
     "cross-env": "^7.0.3",
-    "eslint": "^9.11.1",
+    "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
     "esm-utils": "^4.3.0",
-    "esmock": "^2.6.7",
     "jest": "^29.7.0",
     "jest-light-runner": "^0.6.0",
     "jest-snapshot-serializer-ansi": "^2.1.0",
@@ -92,21 +101,21 @@
     "jest-watch-typeahead": "^2.2.2",
     "lines-and-columns": "^2.0.4",
     "prettier": "^3.3.3",
-    "proxyquire": "^2.1.3",
-    "solc": "^0.8.27",
+    "solc": "^0.8.28",
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.4",
-    "webpack": "^5.95.0",
+    "typescript": "^5.6.3",
+    "webpack": "^5.96.1",
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@nomicfoundation/slang": "0.17.0",
+    "@nomicfoundation/slang": "0.18.3",
     "@solidity-parser/parser": "^0.18.0",
-    "semver": "^7.6.3"
+    "semver": "^7.6.3",
+    "strip-comments": "^2.0.1"
   },
   "peerDependencies": {
-    "prettier": ">=2.3.0"
+    "prettier": ">=3.0.0"
   },
   "browserslist": {
     "production": [
diff --git a/src/clean.ts b/src/clean.ts
index 11a165f03..fee102793 100644
--- a/src/clean.ts
+++ b/src/clean.ts
@@ -5,7 +5,7 @@ const ignoredProperties = new Set([
   'comments',
   // this function is defined at constructor time so it won't pass AST
   // comparisons.
-  'cleanModifierInvocationArguments'
+  'isEmpty'
 ]);
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 function clean(/* ast, newObj, parent */): void {}
diff --git a/src/index.ts b/src/index.ts
index 0ec0efeb3..c802f1ee8 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -16,7 +16,7 @@ import type {
   RequiredOptions,
   SupportLanguage
 } from 'prettier';
-import type { AstNode } from './slang-nodes';
+import type { AstNode } from './slang-nodes/types.d.ts';
 
 const slangParserId = 'slang-solidity';
 const antlrParserId = 'solidity-parse';
@@ -94,12 +94,4 @@ const defaultOptions: Partial<RequiredOptions> = {
   tabWidth: 4
 };
 
-const plugin = {
-  languages,
-  parsers,
-  printers,
-  options,
-  defaultOptions
-};
-
-export default plugin;
+export default { languages, parsers, printers, options, defaultOptions };
diff --git a/src/printer.js b/src/printer.js
index f269b5b4b..969bb9bd4 100644
--- a/src/printer.js
+++ b/src/printer.js
@@ -23,18 +23,8 @@ const warnDeprecation = once(() => {
   return true;
 });
 
-const prettierVersionCheck = once(() => {
-  if (!prettierVersionSatisfies('>=2.3.0')) {
-    throw new Error(
-      'The version of prettier in your node-modules does not satisfy the required ">=2.3.0" constraint. Please update the version of Prettier.'
-    );
-  }
-  return true;
-});
-
 function genericPrint(path, options, print) {
   warnDeprecation();
-  prettierVersionCheck();
 
   const node = path.getValue();
   if (node === null) {
diff --git a/src/slang-comments/handler.ts b/src/slang-comments/handler.ts
index 3cef005a4..9d5a0dc54 100644
--- a/src/slang-comments/handler.ts
+++ b/src/slang-comments/handler.ts
@@ -1,7 +1,7 @@
 import handlers from './handlers/index.js';
 
 import type { ParserOptions } from 'prettier';
-import type { AstNode, Comment } from '../slang-nodes';
+import type { AstNode, Comment } from '../slang-nodes/types.d.ts';
 
 function ownLine(
   comment: Comment,
@@ -66,8 +66,4 @@ function remaining(
   return handlers.some((handler) => handler(handlerArguments));
 }
 
-export const handleComments = {
-  ownLine,
-  endOfLine,
-  remaining
-};
+export const handleComments = { ownLine, endOfLine, remaining };
diff --git a/src/slang-comments/handlers/add-collection-node-first-comment.ts b/src/slang-comments/handlers/add-collection-node-first-comment.ts
index 44e16c4de..fa604808f 100644
--- a/src/slang-comments/handlers/add-collection-node-first-comment.ts
+++ b/src/slang-comments/handlers/add-collection-node-first-comment.ts
@@ -1,6 +1,6 @@
 import { util } from 'prettier';
 
-import type { Comment, CollectionNode } from '../../slang-nodes';
+import type { Comment, CollectionNode } from '../../slang-nodes/types.d.ts';
 
 const { addDanglingComment, addLeadingComment } = util;
 
diff --git a/src/slang-comments/handlers/add-collection-node-last-comment.ts b/src/slang-comments/handlers/add-collection-node-last-comment.ts
index 5f53a2e6b..3924f8c10 100644
--- a/src/slang-comments/handlers/add-collection-node-last-comment.ts
+++ b/src/slang-comments/handlers/add-collection-node-last-comment.ts
@@ -1,6 +1,6 @@
 import { util } from 'prettier';
 
-import type { Comment, CollectionNode } from '../../slang-nodes';
+import type { Comment, CollectionNode } from '../../slang-nodes/types.d.ts';
 
 const { addDanglingComment, addTrailingComment } = util;
 
diff --git a/src/slang-comments/handlers/handle-block-comments.ts b/src/slang-comments/handlers/handle-block-comments.ts
index becb049e9..1f05e3925 100644
--- a/src/slang-comments/handlers/handle-block-comments.ts
+++ b/src/slang-comments/handlers/handle-block-comments.ts
@@ -1,8 +1,8 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 export default function handleBlockComments({
   precedingNode,
diff --git a/src/slang-comments/handlers/handle-contract-definition-comments.ts b/src/slang-comments/handlers/handle-contract-definition-comments.ts
index 9df4253bf..2053f5a41 100644
--- a/src/slang-comments/handlers/handle-contract-definition-comments.ts
+++ b/src/slang-comments/handlers/handle-contract-definition-comments.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
-import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/backward-compatibility.js';
+import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 const { addLeadingComment, addTrailingComment } = util;
 
@@ -18,7 +18,10 @@ export default function handleContractDefinitionComments({
     return false;
   }
 
-  const nextCharacter = getNextNonSpaceNonCommentCharacter(text, comment);
+  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+    text,
+    locEnd(comment)
+  );
 
   // Everything before the InheritanceSpecifier is pushed onto the beginning of
   // the ContractDefinition.
diff --git a/src/slang-comments/handlers/handle-else-branch-comments.ts b/src/slang-comments/handlers/handle-else-branch-comments.ts
index 3822e68cd..0e25060c7 100644
--- a/src/slang-comments/handlers/handle-else-branch-comments.ts
+++ b/src/slang-comments/handlers/handle-else-branch-comments.ts
@@ -1,8 +1,8 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 const { addLeadingComment } = util;
 
diff --git a/src/slang-comments/handlers/handle-if-statement-comments.ts b/src/slang-comments/handlers/handle-if-statement-comments.ts
index 01c7c183e..e03560b57 100644
--- a/src/slang-comments/handlers/handle-if-statement-comments.ts
+++ b/src/slang-comments/handlers/handle-if-statement-comments.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
-import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/backward-compatibility.js';
+import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 const { addLeadingComment, addTrailingComment } = util;
 
@@ -23,7 +23,10 @@ export default function handleIfStatementComments({
   //   if (a /* comment */) {}
   // The only workaround I found is to look at the next character to see if
   // it is a ).
-  const nextCharacter = getNextNonSpaceNonCommentCharacter(text, comment);
+  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+    text,
+    locEnd(comment)
+  );
   if (nextCharacter === ')') {
     addTrailingComment(precedingNode, comment);
     return true;
diff --git a/src/slang-comments/handlers/handle-interface-definition-comments.ts b/src/slang-comments/handlers/handle-interface-definition-comments.ts
index 1cab77e38..43dcfde07 100644
--- a/src/slang-comments/handlers/handle-interface-definition-comments.ts
+++ b/src/slang-comments/handlers/handle-interface-definition-comments.ts
@@ -1,9 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/backward-compatibility.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
+import { util } from 'prettier';
+import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 export default function handleInterfaceDefinitionComments({
   text,
@@ -16,7 +17,10 @@ export default function handleInterfaceDefinitionComments({
     return false;
   }
 
-  const nextCharacter = getNextNonSpaceNonCommentCharacter(text, comment);
+  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+    text,
+    locEnd(comment)
+  );
 
   // The comment is at the end of the body of the InterfaceDefinition.
   if (precedingNode?.kind === NonterminalKind.InterfaceMembers) {
diff --git a/src/slang-comments/handlers/handle-library-definition-comments.ts b/src/slang-comments/handlers/handle-library-definition-comments.ts
index 398395e41..4421794dc 100644
--- a/src/slang-comments/handlers/handle-library-definition-comments.ts
+++ b/src/slang-comments/handlers/handle-library-definition-comments.ts
@@ -1,9 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/backward-compatibility.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
+import { util } from 'prettier';
+import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 export default function handleLibraryDefinitionComments({
   text,
@@ -16,7 +17,10 @@ export default function handleLibraryDefinitionComments({
     return false;
   }
 
-  const nextCharacter = getNextNonSpaceNonCommentCharacter(text, comment);
+  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+    text,
+    locEnd(comment)
+  );
 
   // The comment is at the end of the body of the ContractDefinition.
   if (precedingNode?.kind === NonterminalKind.LibraryMembers) {
diff --git a/src/slang-comments/handlers/handle-modifier-invocation-comments.ts b/src/slang-comments/handlers/handle-modifier-invocation-comments.ts
index 3b785893e..76869222d 100644
--- a/src/slang-comments/handlers/handle-modifier-invocation-comments.ts
+++ b/src/slang-comments/handlers/handle-modifier-invocation-comments.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
-import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/backward-compatibility.js';
+import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 const { addTrailingComment } = util;
 
@@ -18,7 +18,10 @@ export default function handleModifierInvocationComments({
     return false;
   }
 
-  const nextCharacter = getNextNonSpaceNonCommentCharacter(text, comment);
+  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+    text,
+    locEnd(comment)
+  );
 
   // The last comments before the body.
   if (
diff --git a/src/slang-comments/handlers/handle-parameters-declaration-comments.ts b/src/slang-comments/handlers/handle-parameters-declaration-comments.ts
index c73fe1c89..b2cbcd1a9 100644
--- a/src/slang-comments/handlers/handle-parameters-declaration-comments.ts
+++ b/src/slang-comments/handlers/handle-parameters-declaration-comments.ts
@@ -1,8 +1,8 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 export default function handleBlockComments({
   precedingNode,
diff --git a/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts b/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts
index 0567ac3cf..5078a0c40 100644
--- a/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts
+++ b/src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts
@@ -1,8 +1,8 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 export default function handlePositionalArgumentsDeclarationComments({
   precedingNode,
diff --git a/src/slang-comments/handlers/handle-while-statement-comments.ts b/src/slang-comments/handlers/handle-while-statement-comments.ts
index 67a74c1ff..29898c65f 100644
--- a/src/slang-comments/handlers/handle-while-statement-comments.ts
+++ b/src/slang-comments/handlers/handle-while-statement-comments.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
-import { getNextNonSpaceNonCommentCharacter } from '../../slang-utils/backward-compatibility.js';
+import { locEnd } from '../../slang-utils/loc.js';
 import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 const { addLeadingComment, addTrailingComment } = util;
 
@@ -26,7 +26,10 @@ export default function handleWhileStatementComments({
   //   while (a /* comment */) {}
   // The only workaround I found is to look at the next character to see if
   // it is a ).
-  const nextCharacter = getNextNonSpaceNonCommentCharacter(text, comment);
+  const nextCharacter = util.getNextNonSpaceNonCommentCharacter(
+    text,
+    locEnd(comment)
+  );
   if (nextCharacter === ')' || enclosingNode.condition === precedingNode) {
     addTrailingComment(precedingNode, comment);
     return true;
diff --git a/src/slang-comments/handlers/handle-yul-block-comments.ts b/src/slang-comments/handlers/handle-yul-block-comments.ts
index 5a6786791..edaf07f0f 100644
--- a/src/slang-comments/handlers/handle-yul-block-comments.ts
+++ b/src/slang-comments/handlers/handle-yul-block-comments.ts
@@ -1,7 +1,7 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 
-import type { HandlerParams } from './types';
+import type { HandlerParams } from './types.d.ts';
 
 const { addLeadingComment, addDanglingComment } = util;
 
diff --git a/src/slang-comments/handlers/types.d.ts b/src/slang-comments/handlers/types.d.ts
index c8cc26933..b476c9c4f 100644
--- a/src/slang-comments/handlers/types.d.ts
+++ b/src/slang-comments/handlers/types.d.ts
@@ -1,4 +1,4 @@
-import type { Comment, StrictAstNode } from '../../slang-nodes';
+import type { Comment, StrictAstNode } from '../../slang-nodes/types.d.ts';
 
 interface HandlerParams {
   text: string;
diff --git a/src/slang-comments/printer.ts b/src/slang-comments/printer.ts
index 6f964ba97..cb2edf6bd 100644
--- a/src/slang-comments/printer.ts
+++ b/src/slang-comments/printer.ts
@@ -1,7 +1,7 @@
 import { isComment } from '../slang-utils/is-comment.js';
 
 import type { AstPath, Doc } from 'prettier';
-import type { AstNode } from '../slang-nodes';
+import type { AstNode } from '../slang-nodes/types.d.ts';
 
 export function printComment(commentPath: AstPath<AstNode>): Doc {
   const comment = commentPath.getNode()!;
diff --git a/src/slang-nodes/ABICoderPragma.ts b/src/slang-nodes/AbicoderPragma.ts
similarity index 60%
rename from src/slang-nodes/ABICoderPragma.ts
rename to src/slang-nodes/AbicoderPragma.ts
index e034658fb..6eb96a77b 100644
--- a/src/slang-nodes/ABICoderPragma.ts
+++ b/src/slang-nodes/AbicoderPragma.ts
@@ -1,13 +1,13 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
-export class ABICoderPragma implements SlangNode {
-  readonly kind = NonterminalKind.ABICoderPragma;
+export class AbicoderPragma implements SlangNode {
+  readonly kind = NonterminalKind.AbicoderPragma;
 
   comments;
 
@@ -15,7 +15,7 @@ export class ABICoderPragma implements SlangNode {
 
   version: Identifier;
 
-  constructor(ast: ast.ABICoderPragma, offset: number) {
+  constructor(ast: ast.AbicoderPragma, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
     const { offsets } = metadata;
 
@@ -25,7 +25,7 @@ export class ABICoderPragma implements SlangNode {
     this.loc = metadata.loc;
   }
 
-  print(path: AstPath<ABICoderPragma>, print: PrintFunction): Doc {
+  print(path: AstPath<AbicoderPragma>, print: PrintFunction): Doc {
     return ['abicoder ', path.call(print, 'version')];
   }
 }
diff --git a/src/slang-nodes/AdditiveExpression.ts b/src/slang-nodes/AdditiveExpression.ts
index b25376ab5..e7b643622 100644
--- a/src/slang-nodes/AdditiveExpression.ts
+++ b/src/slang-nodes/AdditiveExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printBinaryOperation } from '../slang-printers/print-binary-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const tryToHug = createHugFunction(['%']);
 
@@ -33,7 +33,7 @@ export class AdditiveExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/AddressType.ts b/src/slang-nodes/AddressType.ts
index 2c724b231..14c30e332 100644
--- a/src/slang-nodes/AddressType.ts
+++ b/src/slang-nodes/AddressType.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class AddressType implements SlangNode {
   readonly kind = NonterminalKind.AddressType;
@@ -18,7 +18,7 @@ export class AddressType implements SlangNode {
   constructor(ast: ast.AddressType, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.payableKeyword = ast.payableKeyword?.text;
+    this.payableKeyword = ast.payableKeyword?.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/AndExpression.ts b/src/slang-nodes/AndExpression.ts
index 5b7cd6004..157bb4495 100644
--- a/src/slang-nodes/AndExpression.ts
+++ b/src/slang-nodes/AndExpression.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printLogicalOperation } from '../slang-printers/print-logical-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class AndExpression implements SlangNode {
   readonly kind = NonterminalKind.AndExpression;
@@ -30,7 +30,7 @@ export class AndExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/ArgumentsDeclaration.ts b/src/slang-nodes/ArgumentsDeclaration.ts
index 1f4afad0b..7f2eaf5db 100644
--- a/src/slang-nodes/ArgumentsDeclaration.ts
+++ b/src/slang-nodes/ArgumentsDeclaration.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { PositionalArgumentsDeclaration } from './PositionalArgumentsDeclaration.js';
 import { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ArgumentsDeclaration implements SlangNode {
   readonly kind = NonterminalKind.ArgumentsDeclaration;
diff --git a/src/slang-nodes/ArrayExpression.ts b/src/slang-nodes/ArrayExpression.ts
index f7d8d584a..701eae07d 100644
--- a/src/slang-nodes/ArrayExpression.ts
+++ b/src/slang-nodes/ArrayExpression.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ArrayValues } from './ArrayValues.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group } = doc.builders;
 
diff --git a/src/slang-nodes/ArrayTypeName.ts b/src/slang-nodes/ArrayTypeName.ts
index 4700b5027..115e8565c 100644
--- a/src/slang-nodes/ArrayTypeName.ts
+++ b/src/slang-nodes/ArrayTypeName.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ArrayTypeName implements SlangNode {
   readonly kind = NonterminalKind.ArrayTypeName;
diff --git a/src/slang-nodes/ArrayValues.ts b/src/slang-nodes/ArrayValues.ts
index 8699f74e7..1c63426b0 100644
--- a/src/slang-nodes/ArrayValues.ts
+++ b/src/slang-nodes/ArrayValues.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ArrayValues implements SlangNode {
   readonly kind = NonterminalKind.ArrayValues;
@@ -30,7 +30,7 @@ export class ArrayValues implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new Expression(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/AssemblyFlags.ts b/src/slang-nodes/AssemblyFlags.ts
index eb2012575..8e339931b 100644
--- a/src/slang-nodes/AssemblyFlags.ts
+++ b/src/slang-nodes/AssemblyFlags.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StringLiteral } from './StringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class AssemblyFlags implements SlangNode {
   readonly kind = NonterminalKind.AssemblyFlags;
@@ -30,7 +30,7 @@ export class AssemblyFlags implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new StringLiteral(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/AssemblyFlagsDeclaration.ts b/src/slang-nodes/AssemblyFlagsDeclaration.ts
index 46dc52823..d2e6cd133 100644
--- a/src/slang-nodes/AssemblyFlagsDeclaration.ts
+++ b/src/slang-nodes/AssemblyFlagsDeclaration.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { AssemblyFlags } from './AssemblyFlags.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class AssemblyFlagsDeclaration implements SlangNode {
   readonly kind = NonterminalKind.AssemblyFlagsDeclaration;
diff --git a/src/slang-nodes/AssemblyStatement.ts b/src/slang-nodes/AssemblyStatement.ts
index 98e070a98..34cc419a3 100644
--- a/src/slang-nodes/AssemblyStatement.ts
+++ b/src/slang-nodes/AssemblyStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { StringLiteral } from './StringLiteral.js';
@@ -7,8 +7,8 @@ import { YulBlock } from './YulBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class AssemblyStatement implements SlangNode {
   readonly kind = NonterminalKind.AssemblyStatement;
diff --git a/src/slang-nodes/AssignmentExpression.ts b/src/slang-nodes/AssignmentExpression.ts
index a44e55622..8bee06818 100644
--- a/src/slang-nodes/AssignmentExpression.ts
+++ b/src/slang-nodes/AssignmentExpression.ts
@@ -1,7 +1,4 @@
-import {
-  NonterminalKind,
-  TerminalKind
-} from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -9,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
@@ -36,7 +33,7 @@ export class AssignmentExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/BitwiseAndExpression.ts b/src/slang-nodes/BitwiseAndExpression.ts
index f5e8d2ecb..8932559d2 100644
--- a/src/slang-nodes/BitwiseAndExpression.ts
+++ b/src/slang-nodes/BitwiseAndExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printBinaryOperation } from '../slang-printers/print-binary-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const tryToHug = createHugFunction(['+', '-', '*', '/', '**', '<<', '>>']);
 
@@ -33,7 +33,7 @@ export class BitwiseAndExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/BitwiseOrExpression.ts b/src/slang-nodes/BitwiseOrExpression.ts
index 4bb639c19..143df0437 100644
--- a/src/slang-nodes/BitwiseOrExpression.ts
+++ b/src/slang-nodes/BitwiseOrExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printBinaryOperation } from '../slang-printers/print-binary-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const tryToHug = createHugFunction([
   '+',
@@ -43,7 +43,7 @@ export class BitwiseOrExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/BitwiseXorExpression.ts b/src/slang-nodes/BitwiseXorExpression.ts
index 024eeb701..298aead08 100644
--- a/src/slang-nodes/BitwiseXorExpression.ts
+++ b/src/slang-nodes/BitwiseXorExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printBinaryOperation } from '../slang-printers/print-binary-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const tryToHug = createHugFunction(['+', '-', '*', '/', '**', '<<', '>>', '&']);
 
@@ -33,7 +33,7 @@ export class BitwiseXorExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/Block.ts b/src/slang-nodes/Block.ts
index 0af6065e7..2a6225b65 100644
--- a/src/slang-nodes/Block.ts
+++ b/src/slang-nodes/Block.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Statements } from './Statements.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class Block implements SlangNode {
   readonly kind = NonterminalKind.Block;
diff --git a/src/slang-nodes/BreakStatement.ts b/src/slang-nodes/BreakStatement.ts
index b65ef522c..655267692 100644
--- a/src/slang-nodes/BreakStatement.ts
+++ b/src/slang-nodes/BreakStatement.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class BreakStatement implements SlangNode {
   readonly kind = NonterminalKind.BreakStatement;
diff --git a/src/slang-nodes/CallOptions.ts b/src/slang-nodes/CallOptions.ts
index 2293d912e..2cb5acf5d 100644
--- a/src/slang-nodes/CallOptions.ts
+++ b/src/slang-nodes/CallOptions.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { NamedArgument } from './NamedArgument.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line, softline } = doc.builders;
 
@@ -33,7 +33,7 @@ export class CallOptions implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new NamedArgument(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/CallOptionsExpression.ts b/src/slang-nodes/CallOptionsExpression.ts
index 3fa5d005b..4b776f3cb 100644
--- a/src/slang-nodes/CallOptionsExpression.ts
+++ b/src/slang-nodes/CallOptionsExpression.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 import { CallOptions } from './CallOptions.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class CallOptionsExpression implements SlangNode {
   readonly kind = NonterminalKind.CallOptionsExpression;
diff --git a/src/slang-nodes/CatchClause.ts b/src/slang-nodes/CatchClause.ts
index d536e5cca..0183a34bd 100644
--- a/src/slang-nodes/CatchClause.ts
+++ b/src/slang-nodes/CatchClause.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { CatchClauseError } from './CatchClauseError.js';
 import { Block } from './Block.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class CatchClause implements SlangNode {
   readonly kind = NonterminalKind.CatchClause;
diff --git a/src/slang-nodes/CatchClauseError.ts b/src/slang-nodes/CatchClauseError.ts
index e8ef8afd0..c7ee2ee28 100644
--- a/src/slang-nodes/CatchClauseError.ts
+++ b/src/slang-nodes/CatchClauseError.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group } = doc.builders;
 
diff --git a/src/slang-nodes/CatchClauses.ts b/src/slang-nodes/CatchClauses.ts
index 6a34eaefd..a0580d0de 100644
--- a/src/slang-nodes/CatchClauses.ts
+++ b/src/slang-nodes/CatchClauses.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { CatchClause } from './CatchClause.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join } = doc.builders;
 
diff --git a/src/slang-nodes/ComparisonExpression.ts b/src/slang-nodes/ComparisonExpression.ts
index b6d893aee..f725a23ce 100644
--- a/src/slang-nodes/ComparisonExpression.ts
+++ b/src/slang-nodes/ComparisonExpression.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printComparisonOperation } from '../slang-printers/print-comparison-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ComparisonExpression implements SlangNode {
   readonly kind = NonterminalKind.ComparisonExpression;
@@ -30,7 +30,7 @@ export class ComparisonExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/ConditionalExpression.ts b/src/slang-nodes/ConditionalExpression.ts
index 03d97cc2e..a56968fae 100644
--- a/src/slang-nodes/ConditionalExpression.ts
+++ b/src/slang-nodes/ConditionalExpression.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, StrictAstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode, StrictAstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, hardline, ifBreak, indent, line, softline } = doc.builders;
 
diff --git a/src/slang-nodes/ConstantDefinition.ts b/src/slang-nodes/ConstantDefinition.ts
index 24797e9b7..e5a7da055 100644
--- a/src/slang-nodes/ConstantDefinition.ts
+++ b/src/slang-nodes/ConstantDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 import { Identifier } from './Identifier.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ConstantDefinition implements SlangNode {
   readonly kind = NonterminalKind.ConstantDefinition;
diff --git a/src/slang-nodes/ConstructorAttribute.ts b/src/slang-nodes/ConstructorAttribute.ts
index 61ecfdcae..451eac6b8 100644
--- a/src/slang-nodes/ConstructorAttribute.ts
+++ b/src/slang-nodes/ConstructorAttribute.ts
@@ -1,12 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ConstructorAttribute implements SlangNode {
   readonly kind = NonterminalKind.ConstructorAttribute;
@@ -27,7 +26,7 @@ export class ConstructorAttribute implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new ModifierInvocation(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/ConstructorAttributes.ts b/src/slang-nodes/ConstructorAttributes.ts
index 7f2bec90a..e1ba845a8 100644
--- a/src/slang-nodes/ConstructorAttributes.ts
+++ b/src/slang-nodes/ConstructorAttributes.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ConstructorAttribute } from './ConstructorAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/ConstructorDefinition.ts b/src/slang-nodes/ConstructorDefinition.ts
index 1e0c674fa..939e11857 100644
--- a/src/slang-nodes/ConstructorDefinition.ts
+++ b/src/slang-nodes/ConstructorDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -7,8 +7,8 @@ import { Block } from './Block.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ConstructorDefinition implements SlangNode {
   readonly kind = NonterminalKind.ConstructorDefinition;
diff --git a/src/slang-nodes/ContinueStatement.ts b/src/slang-nodes/ContinueStatement.ts
index 0b3b2f91b..0d4a70566 100644
--- a/src/slang-nodes/ContinueStatement.ts
+++ b/src/slang-nodes/ContinueStatement.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class ContinueStatement implements SlangNode {
   readonly kind = NonterminalKind.ContinueStatement;
diff --git a/src/slang-nodes/ContractDefinition.ts b/src/slang-nodes/ContractDefinition.ts
index eae0e7443..91dfc56f7 100644
--- a/src/slang-nodes/ContractDefinition.ts
+++ b/src/slang-nodes/ContractDefinition.ts
@@ -1,6 +1,6 @@
 import { doc } from 'prettier';
 import { coerce, satisfies } from 'semver';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { InheritanceSpecifier } from './InheritanceSpecifier.js';
@@ -8,8 +8,8 @@ import { ContractMembers } from './ContractMembers.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, line } = doc.builders;
 
@@ -36,7 +36,7 @@ export class ContractDefinition implements SlangNode {
     let metadata = getNodeMetadata(ast, offset);
     const { offsets } = metadata;
 
-    this.abstractKeyword = ast.abstractKeyword?.text;
+    this.abstractKeyword = ast.abstractKeyword?.unparse();
     this.name = new Identifier(ast.name, offsets[0]);
     let i = 1;
     if (ast.inheritance) {
diff --git a/src/slang-nodes/ContractMember.ts b/src/slang-nodes/ContractMember.ts
index fcd76624b..77e3bd9dd 100644
--- a/src/slang-nodes/ContractMember.ts
+++ b/src/slang-nodes/ContractMember.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { UsingDirective } from './UsingDirective.js';
 import { FunctionDefinition } from './FunctionDefinition.js';
@@ -16,8 +16,8 @@ import { UserDefinedValueTypeDefinition } from './UserDefinedValueTypeDefinition
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ContractMember implements SlangNode {
   readonly kind = NonterminalKind.ContractMember;
diff --git a/src/slang-nodes/ContractMembers.ts b/src/slang-nodes/ContractMembers.ts
index efea7722e..aa8ed701d 100644
--- a/src/slang-nodes/ContractMembers.ts
+++ b/src/slang-nodes/ContractMembers.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printComments } from '../slang-printers/print-comments.js';
 import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js';
@@ -8,8 +8,8 @@ import { ContractMember } from './ContractMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
diff --git a/src/slang-nodes/DecimalNumberExpression.ts b/src/slang-nodes/DecimalNumberExpression.ts
index a1592d7c0..7791ad3cc 100644
--- a/src/slang-nodes/DecimalNumberExpression.ts
+++ b/src/slang-nodes/DecimalNumberExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { NumberUnit } from './NumberUnit.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class DecimalNumberExpression implements SlangNode {
   readonly kind = NonterminalKind.DecimalNumberExpression;
@@ -22,7 +22,7 @@ export class DecimalNumberExpression implements SlangNode {
     let metadata = getNodeMetadata(ast, offset);
     const { offsets } = metadata;
 
-    this.literal = ast.literal.text;
+    this.literal = ast.literal.unparse();
     if (ast.unit) {
       this.unit = new NumberUnit(ast.unit, offsets[0]);
     }
diff --git a/src/slang-nodes/DoWhileStatement.ts b/src/slang-nodes/DoWhileStatement.ts
index 5b5781bff..76904dc66 100644
--- a/src/slang-nodes/DoWhileStatement.ts
+++ b/src/slang-nodes/DoWhileStatement.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Statement } from './Statement.js';
@@ -7,8 +7,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/ElementaryType.ts b/src/slang-nodes/ElementaryType.ts
index 26a968520..f506b8cb1 100644
--- a/src/slang-nodes/ElementaryType.ts
+++ b/src/slang-nodes/ElementaryType.ts
@@ -1,11 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { AddressType } from './AddressType.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ElementaryType implements SlangNode {
   readonly kind = NonterminalKind.ElementaryType;
@@ -22,7 +21,7 @@ export class ElementaryType implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new AddressType(ast.variant, offsets[0]);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/ElseBranch.ts b/src/slang-nodes/ElseBranch.ts
index b621a083c..585ee0f8a 100644
--- a/src/slang-nodes/ElseBranch.ts
+++ b/src/slang-nodes/ElseBranch.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Statement } from './Statement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/EmitStatement.ts b/src/slang-nodes/EmitStatement.ts
index 48f8dfc77..22c42fd03 100644
--- a/src/slang-nodes/EmitStatement.ts
+++ b/src/slang-nodes/EmitStatement.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { IdentifierPath } from './IdentifierPath.js';
 import { ArgumentsDeclaration } from './ArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EmitStatement implements SlangNode {
   readonly kind = NonterminalKind.EmitStatement;
diff --git a/src/slang-nodes/EnumDefinition.ts b/src/slang-nodes/EnumDefinition.ts
index b539a5df9..5e8bda457 100644
--- a/src/slang-nodes/EnumDefinition.ts
+++ b/src/slang-nodes/EnumDefinition.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { EnumMembers } from './EnumMembers.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EnumDefinition implements SlangNode {
   readonly kind = NonterminalKind.EnumDefinition;
diff --git a/src/slang-nodes/EnumMembers.ts b/src/slang-nodes/EnumMembers.ts
index 905f96921..391b36391 100644
--- a/src/slang-nodes/EnumMembers.ts
+++ b/src/slang-nodes/EnumMembers.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
@@ -28,7 +28,7 @@ export class EnumMembers implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new Identifier(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/EqualityExpression.ts b/src/slang-nodes/EqualityExpression.ts
index f08d4471b..16d41b2b8 100644
--- a/src/slang-nodes/EqualityExpression.ts
+++ b/src/slang-nodes/EqualityExpression.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printComparisonOperation } from '../slang-printers/print-comparison-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EqualityExpression implements SlangNode {
   readonly kind = NonterminalKind.EqualityExpression;
@@ -30,7 +30,7 @@ export class EqualityExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/ErrorDefinition.ts b/src/slang-nodes/ErrorDefinition.ts
index 8e2f82312..d6775f698 100644
--- a/src/slang-nodes/ErrorDefinition.ts
+++ b/src/slang-nodes/ErrorDefinition.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { ErrorParametersDeclaration } from './ErrorParametersDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ErrorDefinition implements SlangNode {
   readonly kind = NonterminalKind.ErrorDefinition;
diff --git a/src/slang-nodes/ErrorParameter.ts b/src/slang-nodes/ErrorParameter.ts
index f96652398..212cbe62a 100644
--- a/src/slang-nodes/ErrorParameter.ts
+++ b/src/slang-nodes/ErrorParameter.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { TypeName } from './TypeName.js';
@@ -6,8 +6,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ErrorParameter implements SlangNode {
   readonly kind = NonterminalKind.ErrorParameter;
diff --git a/src/slang-nodes/ErrorParameters.ts b/src/slang-nodes/ErrorParameters.ts
index 1d0c3e830..a0639cc53 100644
--- a/src/slang-nodes/ErrorParameters.ts
+++ b/src/slang-nodes/ErrorParameters.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ErrorParameter } from './ErrorParameter.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ErrorParameters implements SlangNode {
   readonly kind = NonterminalKind.ErrorParameters;
@@ -30,7 +30,7 @@ export class ErrorParameters implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new ErrorParameter(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/ErrorParametersDeclaration.ts b/src/slang-nodes/ErrorParametersDeclaration.ts
index c82b2cefe..7e3f0780d 100644
--- a/src/slang-nodes/ErrorParametersDeclaration.ts
+++ b/src/slang-nodes/ErrorParametersDeclaration.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ErrorParameters } from './ErrorParameters.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ErrorParametersDeclaration implements SlangNode {
   readonly kind = NonterminalKind.ErrorParametersDeclaration;
diff --git a/src/slang-nodes/EventDefinition.ts b/src/slang-nodes/EventDefinition.ts
index 9b528eb5a..ea3088f18 100644
--- a/src/slang-nodes/EventDefinition.ts
+++ b/src/slang-nodes/EventDefinition.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { EventParametersDeclaration } from './EventParametersDeclaration.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EventDefinition implements SlangNode {
   readonly kind = NonterminalKind.EventDefinition;
@@ -35,7 +35,7 @@ export class EventDefinition implements SlangNode {
       offsets[1],
       options
     );
-    this.anonymousKeyword = ast.anonymousKeyword?.text;
+    this.anonymousKeyword = ast.anonymousKeyword?.unparse();
 
     metadata = updateMetadata(metadata, [this.parameters]);
 
diff --git a/src/slang-nodes/EventParameter.ts b/src/slang-nodes/EventParameter.ts
index 4b6bf40e1..f8582d2e2 100644
--- a/src/slang-nodes/EventParameter.ts
+++ b/src/slang-nodes/EventParameter.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { TypeName } from './TypeName.js';
@@ -6,8 +6,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EventParameter implements SlangNode {
   readonly kind = NonterminalKind.EventParameter;
@@ -31,7 +31,7 @@ export class EventParameter implements SlangNode {
     const { offsets } = metadata;
 
     this.typeName = new TypeName(ast.typeName, offsets[0], options);
-    this.indexedKeyword = ast.indexedKeyword?.text;
+    this.indexedKeyword = ast.indexedKeyword?.unparse();
     if (ast.name) {
       this.name = new Identifier(ast.name, offsets[1]);
     }
diff --git a/src/slang-nodes/EventParameters.ts b/src/slang-nodes/EventParameters.ts
index 61ee6b4af..5178b3148 100644
--- a/src/slang-nodes/EventParameters.ts
+++ b/src/slang-nodes/EventParameters.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { EventParameter } from './EventParameter.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EventParameters implements SlangNode {
   readonly kind = NonterminalKind.EventParameters;
@@ -30,7 +30,7 @@ export class EventParameters implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new EventParameter(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/EventParametersDeclaration.ts b/src/slang-nodes/EventParametersDeclaration.ts
index 3cba0a19d..06b94cf23 100644
--- a/src/slang-nodes/EventParametersDeclaration.ts
+++ b/src/slang-nodes/EventParametersDeclaration.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { EventParameters } from './EventParameters.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class EventParametersDeclaration implements SlangNode {
   readonly kind = NonterminalKind.EventParametersDeclaration;
diff --git a/src/slang-nodes/ExperimentalFeature.ts b/src/slang-nodes/ExperimentalFeature.ts
index 05a521d13..889bd97e1 100644
--- a/src/slang-nodes/ExperimentalFeature.ts
+++ b/src/slang-nodes/ExperimentalFeature.ts
@@ -1,16 +1,16 @@
 import {
   NonterminalKind,
-  TerminalKind
-} from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+  TerminalKind,
+  TerminalNode
+} from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StringLiteral } from './StringLiteral.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ExperimentalFeature implements SlangNode {
   readonly kind = NonterminalKind.ExperimentalFeature;
diff --git a/src/slang-nodes/ExperimentalPragma.ts b/src/slang-nodes/ExperimentalPragma.ts
index 1bcf2a42d..3aa36480f 100644
--- a/src/slang-nodes/ExperimentalPragma.ts
+++ b/src/slang-nodes/ExperimentalPragma.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ExperimentalFeature } from './ExperimentalFeature.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ExperimentalPragma implements SlangNode {
   readonly kind = NonterminalKind.ExperimentalPragma;
diff --git a/src/slang-nodes/ExponentiationExpression.ts b/src/slang-nodes/ExponentiationExpression.ts
index 3dd01d84d..927465a39 100644
--- a/src/slang-nodes/ExponentiationExpression.ts
+++ b/src/slang-nodes/ExponentiationExpression.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { createBinaryOperationPrinter } from '../slang-printers/create-binary-operation-printer.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -7,8 +7,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent } = doc.builders;
 
@@ -45,7 +45,7 @@ export class ExponentiationExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/Expression.ts b/src/slang-nodes/Expression.ts
index b090fb1bb..9c0d2bb63 100644
--- a/src/slang-nodes/Expression.ts
+++ b/src/slang-nodes/Expression.ts
@@ -1,8 +1,8 @@
 import {
   NonterminalKind,
-  TerminalKind
-} from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+  TerminalKind,
+  TerminalNode
+} from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { AssignmentExpression } from './AssignmentExpression.js';
 import { ConditionalExpression } from './ConditionalExpression.js';
@@ -35,8 +35,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class Expression implements SlangNode {
   readonly kind = NonterminalKind.Expression;
diff --git a/src/slang-nodes/ExpressionStatement.ts b/src/slang-nodes/ExpressionStatement.ts
index 5393edc38..f966f925e 100644
--- a/src/slang-nodes/ExpressionStatement.ts
+++ b/src/slang-nodes/ExpressionStatement.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ExpressionStatement implements SlangNode {
   readonly kind = NonterminalKind.ExpressionStatement;
diff --git a/src/slang-nodes/FallbackFunctionAttribute.ts b/src/slang-nodes/FallbackFunctionAttribute.ts
index 3b7ca0b39..a0702f22c 100644
--- a/src/slang-nodes/FallbackFunctionAttribute.ts
+++ b/src/slang-nodes/FallbackFunctionAttribute.ts
@@ -1,13 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FallbackFunctionAttribute implements SlangNode {
   readonly kind = NonterminalKind.FallbackFunctionAttribute;
@@ -27,7 +26,7 @@ export class FallbackFunctionAttribute implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
-      this.variant = ast.variant.text;
+      this.variant = ast.variant.unparse();
     } else {
       switch (ast.variant.cst.kind) {
         case NonterminalKind.ModifierInvocation:
diff --git a/src/slang-nodes/FallbackFunctionAttributes.ts b/src/slang-nodes/FallbackFunctionAttributes.ts
index 16b36b288..04aa6ae8a 100644
--- a/src/slang-nodes/FallbackFunctionAttributes.ts
+++ b/src/slang-nodes/FallbackFunctionAttributes.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { FallbackFunctionAttribute } from './FallbackFunctionAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/FallbackFunctionDefinition.ts b/src/slang-nodes/FallbackFunctionDefinition.ts
index ec69f3985..fc213c4e2 100644
--- a/src/slang-nodes/FallbackFunctionDefinition.ts
+++ b/src/slang-nodes/FallbackFunctionDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -8,8 +8,8 @@ import { FunctionBody } from './FunctionBody.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FallbackFunctionDefinition implements SlangNode {
   readonly kind = NonterminalKind.FallbackFunctionDefinition;
diff --git a/src/slang-nodes/ForStatement.ts b/src/slang-nodes/ForStatement.ts
index da95d4dcd..d18e5dcfc 100644
--- a/src/slang-nodes/ForStatement.ts
+++ b/src/slang-nodes/ForStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -9,8 +9,8 @@ import { Statement } from './Statement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/ForStatementCondition.ts b/src/slang-nodes/ForStatementCondition.ts
index ec5608a0b..999fee601 100644
--- a/src/slang-nodes/ForStatementCondition.ts
+++ b/src/slang-nodes/ForStatementCondition.ts
@@ -1,12 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ForStatementCondition implements SlangNode {
   readonly kind = NonterminalKind.ForStatementCondition;
@@ -27,7 +26,7 @@ export class ForStatementCondition implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new ExpressionStatement(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/ForStatementInitialization.ts b/src/slang-nodes/ForStatementInitialization.ts
index 63f1b111f..1651c4025 100644
--- a/src/slang-nodes/ForStatementInitialization.ts
+++ b/src/slang-nodes/ForStatementInitialization.ts
@@ -1,5 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 import { VariableDeclarationStatement } from './VariableDeclarationStatement.js';
@@ -7,8 +6,8 @@ import { TupleDeconstructionStatement } from './TupleDeconstructionStatement.js'
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ForStatementInitialization implements SlangNode {
   readonly kind = NonterminalKind.ForStatementInitialization;
@@ -32,7 +31,7 @@ export class ForStatementInitialization implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
-      this.variant = ast.variant.text;
+      this.variant = ast.variant.unparse();
     } else {
       switch (ast.variant.cst.kind) {
         case NonterminalKind.ExpressionStatement:
diff --git a/src/slang-nodes/FunctionAttribute.ts b/src/slang-nodes/FunctionAttribute.ts
index ff81dbf34..c6f79f8f3 100644
--- a/src/slang-nodes/FunctionAttribute.ts
+++ b/src/slang-nodes/FunctionAttribute.ts
@@ -1,13 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FunctionAttribute implements SlangNode {
   readonly kind = NonterminalKind.FunctionAttribute;
@@ -27,7 +26,7 @@ export class FunctionAttribute implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
-      this.variant = ast.variant.text;
+      this.variant = ast.variant.unparse();
     } else {
       switch (ast.variant.cst.kind) {
         case NonterminalKind.ModifierInvocation:
diff --git a/src/slang-nodes/FunctionAttributes.ts b/src/slang-nodes/FunctionAttributes.ts
index b938943b6..433513ec3 100644
--- a/src/slang-nodes/FunctionAttributes.ts
+++ b/src/slang-nodes/FunctionAttributes.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { FunctionAttribute } from './FunctionAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/FunctionBody.ts b/src/slang-nodes/FunctionBody.ts
index 21a73fa3a..a598ba34e 100644
--- a/src/slang-nodes/FunctionBody.ts
+++ b/src/slang-nodes/FunctionBody.ts
@@ -1,12 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Block } from './Block.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FunctionBody implements SlangNode {
   readonly kind = NonterminalKind.FunctionBody;
@@ -27,7 +26,7 @@ export class FunctionBody implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new Block(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/FunctionCallExpression.ts b/src/slang-nodes/FunctionCallExpression.ts
index 62c7dd539..c1140e71e 100644
--- a/src/slang-nodes/FunctionCallExpression.ts
+++ b/src/slang-nodes/FunctionCallExpression.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { isLabel } from '../slang-utils/is-label.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
@@ -7,8 +7,8 @@ import { ArgumentsDeclaration } from './ArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indentIfBreak, label } = doc.builders;
 
@@ -54,10 +54,7 @@ export class FunctionCallExpression implements SlangNode {
       operandDoc = group(operandDoc.contents, {
         id: Symbol('FunctionCallExpression.operand')
       });
-
-      argumentsDoc = indentIfBreak(argumentsDoc, {
-        groupId: operandDoc.id!
-      });
+      argumentsDoc = indentIfBreak(argumentsDoc, { groupId: operandDoc.id! });
       // We wrap the expression in a label in case there is an IndexAccess or
       // a FunctionCall following this IndexAccess.
       return label('MemberAccessChain', [operandDoc, argumentsDoc]);
diff --git a/src/slang-nodes/FunctionDefinition.ts b/src/slang-nodes/FunctionDefinition.ts
index f177f4fcf..a30a65e7f 100644
--- a/src/slang-nodes/FunctionDefinition.ts
+++ b/src/slang-nodes/FunctionDefinition.ts
@@ -1,5 +1,5 @@
 import { coerce, satisfies } from 'semver';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { FunctionName } from './FunctionName.js';
@@ -10,8 +10,8 @@ import { FunctionBody } from './FunctionBody.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FunctionDefinition implements SlangNode {
   readonly kind = NonterminalKind.FunctionDefinition;
diff --git a/src/slang-nodes/FunctionName.ts b/src/slang-nodes/FunctionName.ts
index 134ff8dff..3802f1dd4 100644
--- a/src/slang-nodes/FunctionName.ts
+++ b/src/slang-nodes/FunctionName.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FunctionName implements SlangNode {
   readonly kind = NonterminalKind.FunctionName;
diff --git a/src/slang-nodes/FunctionType.ts b/src/slang-nodes/FunctionType.ts
index 38bcb8d4d..65a706c62 100644
--- a/src/slang-nodes/FunctionType.ts
+++ b/src/slang-nodes/FunctionType.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -7,8 +7,8 @@ import { ReturnsDeclaration } from './ReturnsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class FunctionType implements SlangNode {
   readonly kind = NonterminalKind.FunctionType;
diff --git a/src/slang-nodes/FunctionTypeAttribute.ts b/src/slang-nodes/FunctionTypeAttribute.ts
index ccd5eaee0..122ab55eb 100644
--- a/src/slang-nodes/FunctionTypeAttribute.ts
+++ b/src/slang-nodes/FunctionTypeAttribute.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class FunctionTypeAttribute implements SlangNode {
   readonly kind = NonterminalKind.FunctionTypeAttribute;
@@ -17,7 +17,7 @@ export class FunctionTypeAttribute implements SlangNode {
   constructor(ast: ast.FunctionTypeAttribute, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/FunctionTypeAttributes.ts b/src/slang-nodes/FunctionTypeAttributes.ts
index 353c5e79d..0bfe89024 100644
--- a/src/slang-nodes/FunctionTypeAttributes.ts
+++ b/src/slang-nodes/FunctionTypeAttributes.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { FunctionTypeAttribute } from './FunctionTypeAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/HexNumberExpression.ts b/src/slang-nodes/HexNumberExpression.ts
index e263d5925..b274f7d4a 100644
--- a/src/slang-nodes/HexNumberExpression.ts
+++ b/src/slang-nodes/HexNumberExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { NumberUnit } from './NumberUnit.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class HexNumberExpression implements SlangNode {
   readonly kind = NonterminalKind.HexNumberExpression;
@@ -22,7 +22,7 @@ export class HexNumberExpression implements SlangNode {
     let metadata = getNodeMetadata(ast, offset);
     const { offsets } = metadata;
 
-    this.literal = ast.literal.text;
+    this.literal = ast.literal.unparse();
     if (ast.unit) {
       this.unit = new NumberUnit(ast.unit, offsets[0]);
     }
diff --git a/src/slang-nodes/HexStringLiteral.ts b/src/slang-nodes/HexStringLiteral.ts
index ade0856b8..97f68b7fd 100644
--- a/src/slang-nodes/HexStringLiteral.ts
+++ b/src/slang-nodes/HexStringLiteral.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printString } from '../slang-printers/print-string.js';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { SlangNode } from '../types.d.ts';
 
 export class HexStringLiteral implements SlangNode {
   readonly kind = NonterminalKind.HexStringLiteral;
@@ -23,7 +23,7 @@ export class HexStringLiteral implements SlangNode {
   ) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/HexStringLiterals.ts b/src/slang-nodes/HexStringLiterals.ts
index c2cd75ac6..acdc4f5a2 100644
--- a/src/slang-nodes/HexStringLiterals.ts
+++ b/src/slang-nodes/HexStringLiterals.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { HexStringLiteral } from './HexStringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join, hardline } = doc.builders;
 
diff --git a/src/slang-nodes/Identifier.ts b/src/slang-nodes/Identifier.ts
index 20d9084c3..304b6aa63 100644
--- a/src/slang-nodes/Identifier.ts
+++ b/src/slang-nodes/Identifier.ts
@@ -1,9 +1,8 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 
 import type { Doc } from 'prettier';
-import type { Location, SlangNode } from '../types';
-import type { Comment } from '.';
+import type { Location, SlangNode } from '../types.d.ts';
+import type { Comment } from './types.d.ts';
 
 export class Identifier implements SlangNode {
   readonly kind = TerminalKind.Identifier;
@@ -15,7 +14,7 @@ export class Identifier implements SlangNode {
   value: string;
 
   constructor(ast: TerminalNode, offset: number) {
-    this.value = ast.text;
+    this.value = ast.unparse();
 
     this.comments = [];
     this.loc = {
diff --git a/src/slang-nodes/IdentifierPath.ts b/src/slang-nodes/IdentifierPath.ts
index 195fd0f99..327aba02e 100644
--- a/src/slang-nodes/IdentifierPath.ts
+++ b/src/slang-nodes/IdentifierPath.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class IdentifierPath implements SlangNode {
   readonly kind = NonterminalKind.IdentifierPath;
@@ -24,7 +24,7 @@ export class IdentifierPath implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new Identifier(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/IfStatement.ts b/src/slang-nodes/IfStatement.ts
index a1f3a4885..11a9fae40 100644
--- a/src/slang-nodes/IfStatement.ts
+++ b/src/slang-nodes/IfStatement.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { isBlockComment } from '../slang-utils/is-comment.js';
@@ -9,8 +9,8 @@ import { ElseBranch } from './ElseBranch.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, hardline, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/ImportAlias.ts b/src/slang-nodes/ImportAlias.ts
index e55fa9fc8..23708f37a 100644
--- a/src/slang-nodes/ImportAlias.ts
+++ b/src/slang-nodes/ImportAlias.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ImportAlias implements SlangNode {
   readonly kind = NonterminalKind.ImportAlias;
diff --git a/src/slang-nodes/ImportClause.ts b/src/slang-nodes/ImportClause.ts
index c35ad307e..9521810f3 100644
--- a/src/slang-nodes/ImportClause.ts
+++ b/src/slang-nodes/ImportClause.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { PathImport } from './PathImport.js';
 import { NamedImport } from './NamedImport.js';
@@ -6,8 +6,8 @@ import { ImportDeconstruction } from './ImportDeconstruction.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ImportClause implements SlangNode {
   readonly kind = NonterminalKind.ImportClause;
@@ -48,7 +48,6 @@ export class ImportClause implements SlangNode {
           options
         );
         break;
-
       default:
         throw new Error(`Unexpected variant: ${ast.variant.cst.kind}`);
     }
diff --git a/src/slang-nodes/ImportDeconstruction.ts b/src/slang-nodes/ImportDeconstruction.ts
index 44cd553b9..d6a426002 100644
--- a/src/slang-nodes/ImportDeconstruction.ts
+++ b/src/slang-nodes/ImportDeconstruction.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ImportDeconstructionSymbols } from './ImportDeconstructionSymbols.js';
 import { StringLiteral } from './StringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ImportDeconstruction implements SlangNode {
   readonly kind = NonterminalKind.ImportDeconstruction;
diff --git a/src/slang-nodes/ImportDeconstructionSymbol.ts b/src/slang-nodes/ImportDeconstructionSymbol.ts
index 0b4c66ea3..020d07ecf 100644
--- a/src/slang-nodes/ImportDeconstructionSymbol.ts
+++ b/src/slang-nodes/ImportDeconstructionSymbol.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { ImportAlias } from './ImportAlias.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ImportDeconstructionSymbol implements SlangNode {
   readonly kind = NonterminalKind.ImportDeconstructionSymbol;
diff --git a/src/slang-nodes/ImportDeconstructionSymbols.ts b/src/slang-nodes/ImportDeconstructionSymbols.ts
index fc76cdc77..4c2287bad 100644
--- a/src/slang-nodes/ImportDeconstructionSymbols.ts
+++ b/src/slang-nodes/ImportDeconstructionSymbols.ts
@@ -1,14 +1,14 @@
 import { doc } from 'prettier';
 import { coerce, satisfies } from 'semver';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ImportDeconstructionSymbol } from './ImportDeconstructionSymbol.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line, softline } = doc.builders;
 
@@ -30,7 +30,7 @@ export class ImportDeconstructionSymbols implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new ImportDeconstructionSymbol(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/ImportDirective.ts b/src/slang-nodes/ImportDirective.ts
index 5422a6d1d..81e037b87 100644
--- a/src/slang-nodes/ImportDirective.ts
+++ b/src/slang-nodes/ImportDirective.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ImportClause } from './ImportClause.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ImportDirective implements SlangNode {
   readonly kind = NonterminalKind.ImportDirective;
diff --git a/src/slang-nodes/IndexAccessEnd.ts b/src/slang-nodes/IndexAccessEnd.ts
index 186a652b6..abf95f426 100644
--- a/src/slang-nodes/IndexAccessEnd.ts
+++ b/src/slang-nodes/IndexAccessEnd.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class IndexAccessEnd implements SlangNode {
   readonly kind = NonterminalKind.IndexAccessEnd;
diff --git a/src/slang-nodes/IndexAccessExpression.ts b/src/slang-nodes/IndexAccessExpression.ts
index ba7a9fa92..3a6be7123 100644
--- a/src/slang-nodes/IndexAccessExpression.ts
+++ b/src/slang-nodes/IndexAccessExpression.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { isLabel } from '../slang-utils/is-label.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
@@ -7,8 +7,8 @@ import { IndexAccessEnd } from './IndexAccessEnd.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, indentIfBreak, label, softline } = doc.builders;
 
@@ -65,9 +65,7 @@ export class IndexAccessExpression implements SlangNode {
         id: Symbol('IndexAccessExpression.operand')
       });
 
-      indexDoc = indentIfBreak(indexDoc, {
-        groupId: operandDoc.id!
-      });
+      indexDoc = indentIfBreak(indexDoc, { groupId: operandDoc.id! });
       // We wrap the expression in a label in case there is an IndexAccess or
       // a FunctionCall following this IndexAccess.
       return label('MemberAccessChain', [operandDoc, indexDoc]);
diff --git a/src/slang-nodes/InheritanceSpecifier.ts b/src/slang-nodes/InheritanceSpecifier.ts
index 3aecffa56..113e14175 100644
--- a/src/slang-nodes/InheritanceSpecifier.ts
+++ b/src/slang-nodes/InheritanceSpecifier.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { InheritanceTypes } from './InheritanceTypes.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class InheritanceSpecifier implements SlangNode {
   readonly kind = NonterminalKind.InheritanceSpecifier;
diff --git a/src/slang-nodes/InheritanceType.ts b/src/slang-nodes/InheritanceType.ts
index 6a27f6c5c..72e82163e 100644
--- a/src/slang-nodes/InheritanceType.ts
+++ b/src/slang-nodes/InheritanceType.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { IdentifierPath } from './IdentifierPath.js';
 import { ArgumentsDeclaration } from './ArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class InheritanceType implements SlangNode {
   readonly kind = NonterminalKind.InheritanceType;
diff --git a/src/slang-nodes/InheritanceTypes.ts b/src/slang-nodes/InheritanceTypes.ts
index c2b8afa1e..ed0056f1f 100644
--- a/src/slang-nodes/InheritanceTypes.ts
+++ b/src/slang-nodes/InheritanceTypes.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { InheritanceType } from './InheritanceType.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
@@ -33,7 +33,7 @@ export class InheritanceTypes implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new InheritanceType(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/InterfaceDefinition.ts b/src/slang-nodes/InterfaceDefinition.ts
index 115076858..161480c83 100644
--- a/src/slang-nodes/InterfaceDefinition.ts
+++ b/src/slang-nodes/InterfaceDefinition.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { InheritanceSpecifier } from './InheritanceSpecifier.js';
@@ -7,8 +7,8 @@ import { InterfaceMembers } from './InterfaceMembers.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, line } = doc.builders;
 
diff --git a/src/slang-nodes/InterfaceMembers.ts b/src/slang-nodes/InterfaceMembers.ts
index 33d914ab2..5e3ca725b 100644
--- a/src/slang-nodes/InterfaceMembers.ts
+++ b/src/slang-nodes/InterfaceMembers.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -7,8 +7,8 @@ import { ContractMember } from './ContractMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
diff --git a/src/slang-nodes/LibraryDefinition.ts b/src/slang-nodes/LibraryDefinition.ts
index d799f006f..ffa38e7cd 100644
--- a/src/slang-nodes/LibraryDefinition.ts
+++ b/src/slang-nodes/LibraryDefinition.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { LibraryMembers } from './LibraryMembers.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, line } = doc.builders;
 
diff --git a/src/slang-nodes/LibraryMembers.ts b/src/slang-nodes/LibraryMembers.ts
index 7916adc91..cb893c50b 100644
--- a/src/slang-nodes/LibraryMembers.ts
+++ b/src/slang-nodes/LibraryMembers.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -7,8 +7,8 @@ import { ContractMember } from './ContractMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
diff --git a/src/slang-nodes/MappingKey.ts b/src/slang-nodes/MappingKey.ts
index 91167238b..cec185592 100644
--- a/src/slang-nodes/MappingKey.ts
+++ b/src/slang-nodes/MappingKey.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { MappingKeyType } from './MappingKeyType.js';
@@ -6,7 +6,7 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class MappingKey implements SlangNode {
   readonly kind = NonterminalKind.MappingKey;
diff --git a/src/slang-nodes/MappingKeyType.ts b/src/slang-nodes/MappingKeyType.ts
index e7c4995c4..6f54fca7d 100644
--- a/src/slang-nodes/MappingKeyType.ts
+++ b/src/slang-nodes/MappingKeyType.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ElementaryType } from './ElementaryType.js';
 import { IdentifierPath } from './IdentifierPath.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class MappingKeyType implements SlangNode {
   readonly kind = NonterminalKind.MappingKeyType;
diff --git a/src/slang-nodes/MappingType.ts b/src/slang-nodes/MappingType.ts
index f64b192ba..0913200b0 100644
--- a/src/slang-nodes/MappingType.ts
+++ b/src/slang-nodes/MappingType.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { MappingKey } from './MappingKey.js';
 import { MappingValue } from './MappingValue.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class MappingType implements SlangNode {
   readonly kind = NonterminalKind.MappingType;
diff --git a/src/slang-nodes/MappingValue.ts b/src/slang-nodes/MappingValue.ts
index cf6256309..c1b45b7e9 100644
--- a/src/slang-nodes/MappingValue.ts
+++ b/src/slang-nodes/MappingValue.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { TypeName } from './TypeName.js';
@@ -6,8 +6,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class MappingValue implements SlangNode {
   readonly kind = NonterminalKind.MappingValue;
diff --git a/src/slang-nodes/MemberAccessExpression.ts b/src/slang-nodes/MemberAccessExpression.ts
index 557d17a68..c640b1a5c 100644
--- a/src/slang-nodes/MemberAccessExpression.ts
+++ b/src/slang-nodes/MemberAccessExpression.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { isLabel } from '../slang-utils/is-label.js';
 import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -8,8 +8,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, StrictAstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode, StrictAstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, label, softline } = doc.builders;
 
@@ -37,23 +37,18 @@ function isEndOfChain(
         // If direct ParentNode is a MemberAccess we are not at the end of the
         // chain.
         return false;
-
       case NonterminalKind.IndexAccessExpression:
         // If direct ParentNode is an IndexAccess and currentNode is not the
         // operand then it must be the start or the end in which case it is the
         // end of the chain.
         if (currentNode !== grandparentNode.operand.variant) return true;
         break;
-
       case NonterminalKind.FunctionCallExpression:
         // If direct ParentNode is a FunctionCall and currentNode is not the
         // operand then it must be and argument in which case it is the end
         // of the chain.
         if (currentNode !== grandparentNode.operand.variant) return true;
         break;
-
-      default:
-        break;
     }
   }
   return true;
diff --git a/src/slang-nodes/ModifierAttribute.ts b/src/slang-nodes/ModifierAttribute.ts
index 9ef709945..21973ba76 100644
--- a/src/slang-nodes/ModifierAttribute.ts
+++ b/src/slang-nodes/ModifierAttribute.ts
@@ -1,11 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ModifierAttribute implements SlangNode {
   readonly kind = NonterminalKind.ModifierAttribute;
@@ -22,7 +21,7 @@ export class ModifierAttribute implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new OverrideSpecifier(ast.variant, offsets[0]);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/ModifierAttributes.ts b/src/slang-nodes/ModifierAttributes.ts
index ab6560f6a..0a041b225 100644
--- a/src/slang-nodes/ModifierAttributes.ts
+++ b/src/slang-nodes/ModifierAttributes.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ModifierAttribute } from './ModifierAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/ModifierDefinition.ts b/src/slang-nodes/ModifierDefinition.ts
index 8ae6e8a14..93b5d4809 100644
--- a/src/slang-nodes/ModifierDefinition.ts
+++ b/src/slang-nodes/ModifierDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
@@ -9,8 +9,8 @@ import { FunctionBody } from './FunctionBody.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ModifierDefinition implements SlangNode {
   readonly kind = NonterminalKind.ModifierDefinition;
diff --git a/src/slang-nodes/ModifierInvocation.ts b/src/slang-nodes/ModifierInvocation.ts
index 87a858015..5ba001734 100644
--- a/src/slang-nodes/ModifierInvocation.ts
+++ b/src/slang-nodes/ModifierInvocation.ts
@@ -1,13 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { isBlockComment } from '../slang-utils/is-comment.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { IdentifierPath } from './IdentifierPath.js';
 import { ArgumentsDeclaration } from './ArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ModifierInvocation implements SlangNode {
   readonly kind = NonterminalKind.ModifierInvocation;
@@ -16,8 +15,6 @@ export class ModifierInvocation implements SlangNode {
 
   loc;
 
-  cleanModifierInvocationArguments;
-
   name: IdentifierPath;
 
   arguments?: ArgumentsDeclaration;
@@ -43,20 +40,17 @@ export class ModifierInvocation implements SlangNode {
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
+  }
 
-    this.cleanModifierInvocationArguments = (): void => {
-      if (
-        this.arguments &&
-        this.arguments.variant.kind ===
-          NonterminalKind.PositionalArgumentsDeclaration &&
-        this.arguments.variant.arguments.items.length === 0 && // no arguments
-        !ast
-          .arguments!.variant.cst.children()
-          .some((child) => isBlockComment(child)) // no comments, at this point we need to check the CST
-      ) {
-        delete this.arguments;
-      }
-    };
+  cleanModifierInvocationArguments(): void {
+    if (
+      this.arguments &&
+      this.arguments.variant.kind ===
+        NonterminalKind.PositionalArgumentsDeclaration &&
+      this.arguments.variant.isEmpty()
+    ) {
+      delete this.arguments;
+    }
   }
 
   print(path: AstPath<ModifierInvocation>, print: PrintFunction): Doc {
diff --git a/src/slang-nodes/MultiLineComment.ts b/src/slang-nodes/MultiLineComment.ts
index 23efcf221..4e7055759 100644
--- a/src/slang-nodes/MultiLineComment.ts
+++ b/src/slang-nodes/MultiLineComment.ts
@@ -1,12 +1,11 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { isIndentableBlockComment } from '../slang-utils/is-indentable-block-comment.js';
 import { printIndentableBlockComment } from '../slang-printers/print-indentable-block-comment.js';
 
 import type { Doc } from 'prettier';
-import type { BaseComment, Location, SlangNode } from '../types';
-import type { StrictAstNode } from '.';
+import type { BaseComment, Location, SlangNode } from '../types.d.ts';
+import type { StrictAstNode } from './types.d.ts';
 
 const { join, literalline } = doc.builders;
 
@@ -32,7 +31,7 @@ export class MultiLineComment implements SlangNode, BaseComment {
   followingNode?: StrictAstNode;
 
   constructor(ast: TerminalNode, offset: number) {
-    this.value = ast.text;
+    this.value = ast.unparse();
 
     this.loc = {
       start: offset,
diff --git a/src/slang-nodes/MultiLineNatSpecComment.ts b/src/slang-nodes/MultiLineNatSpecComment.ts
index 2c462deac..3f4cc2fae 100644
--- a/src/slang-nodes/MultiLineNatSpecComment.ts
+++ b/src/slang-nodes/MultiLineNatSpecComment.ts
@@ -1,12 +1,11 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { isIndentableBlockComment } from '../slang-utils/is-indentable-block-comment.js';
 import { printIndentableBlockComment } from '../slang-printers/print-indentable-block-comment.js';
 
 import type { Doc } from 'prettier';
-import type { BaseComment, Location, SlangNode } from '../types';
-import type { StrictAstNode } from '.';
+import type { BaseComment, Location, SlangNode } from '../types.d.ts';
+import type { StrictAstNode } from './types.d.ts';
 
 const { join, literalline } = doc.builders;
 
@@ -32,7 +31,7 @@ export class MultiLineNatSpecComment implements SlangNode, BaseComment {
   followingNode?: StrictAstNode;
 
   constructor(ast: TerminalNode, offset: number) {
-    this.value = ast.text;
+    this.value = ast.unparse();
 
     this.loc = {
       start: offset,
diff --git a/src/slang-nodes/MultiplicativeExpression.ts b/src/slang-nodes/MultiplicativeExpression.ts
index ee6a10bf1..8c1e0bed2 100644
--- a/src/slang-nodes/MultiplicativeExpression.ts
+++ b/src/slang-nodes/MultiplicativeExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printBinaryOperation } from '../slang-printers/print-binary-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const multiplicationTryToHug = createHugFunction(['/', '%']);
 const divisionTryToHug = createHugFunction(['*', '%']);
@@ -35,7 +35,7 @@ export class MultiplicativeExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/NamedArgument.ts b/src/slang-nodes/NamedArgument.ts
index 5664b87e8..050657e24 100644
--- a/src/slang-nodes/NamedArgument.ts
+++ b/src/slang-nodes/NamedArgument.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class NamedArgument implements SlangNode {
   readonly kind = NonterminalKind.NamedArgument;
diff --git a/src/slang-nodes/NamedArgumentGroup.ts b/src/slang-nodes/NamedArgumentGroup.ts
index 0354f45b8..05d6c7285 100644
--- a/src/slang-nodes/NamedArgumentGroup.ts
+++ b/src/slang-nodes/NamedArgumentGroup.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { NamedArguments } from './NamedArguments.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class NamedArgumentGroup implements SlangNode {
   readonly kind = NonterminalKind.NamedArgumentGroup;
diff --git a/src/slang-nodes/NamedArguments.ts b/src/slang-nodes/NamedArguments.ts
index e3acefc00..3d6025d56 100644
--- a/src/slang-nodes/NamedArguments.ts
+++ b/src/slang-nodes/NamedArguments.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { NamedArgument } from './NamedArgument.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line, softline } = doc.builders;
 
@@ -33,7 +33,7 @@ export class NamedArguments implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new NamedArgument(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/NamedArgumentsDeclaration.ts b/src/slang-nodes/NamedArgumentsDeclaration.ts
index d96b256a6..914135488 100644
--- a/src/slang-nodes/NamedArgumentsDeclaration.ts
+++ b/src/slang-nodes/NamedArgumentsDeclaration.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { NamedArgumentGroup } from './NamedArgumentGroup.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class NamedArgumentsDeclaration implements SlangNode {
   readonly kind = NonterminalKind.NamedArgumentsDeclaration;
diff --git a/src/slang-nodes/NamedImport.ts b/src/slang-nodes/NamedImport.ts
index fc78ad80d..902c56d0b 100644
--- a/src/slang-nodes/NamedImport.ts
+++ b/src/slang-nodes/NamedImport.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ImportAlias } from './ImportAlias.js';
 import { StringLiteral } from './StringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class NamedImport implements SlangNode {
   readonly kind = NonterminalKind.NamedImport;
diff --git a/src/slang-nodes/NewExpression.ts b/src/slang-nodes/NewExpression.ts
index c588bff56..82d36174f 100644
--- a/src/slang-nodes/NewExpression.ts
+++ b/src/slang-nodes/NewExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class NewExpression implements SlangNode {
   readonly kind = NonterminalKind.NewExpression;
diff --git a/src/slang-nodes/NumberUnit.ts b/src/slang-nodes/NumberUnit.ts
index c007871c0..b0c002ed6 100644
--- a/src/slang-nodes/NumberUnit.ts
+++ b/src/slang-nodes/NumberUnit.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class NumberUnit implements SlangNode {
   readonly kind = NonterminalKind.NumberUnit;
@@ -17,7 +17,7 @@ export class NumberUnit implements SlangNode {
   constructor(ast: ast.NumberUnit, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/OrExpression.ts b/src/slang-nodes/OrExpression.ts
index 9dd7f7844..0ec8dd63e 100644
--- a/src/slang-nodes/OrExpression.ts
+++ b/src/slang-nodes/OrExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printLogicalOperation } from '../slang-printers/print-logical-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const tryToHug = createHugFunction(['&&']);
 
@@ -33,7 +33,7 @@ export class OrExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/OverridePaths.ts b/src/slang-nodes/OverridePaths.ts
index 08bccf0a7..add9433de 100644
--- a/src/slang-nodes/OverridePaths.ts
+++ b/src/slang-nodes/OverridePaths.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { IdentifierPath } from './IdentifierPath.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class OverridePaths implements SlangNode {
   readonly kind = NonterminalKind.OverridePaths;
@@ -25,7 +25,7 @@ export class OverridePaths implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new IdentifierPath(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/OverridePathsDeclaration.ts b/src/slang-nodes/OverridePathsDeclaration.ts
index 67e31a00d..ab3a642d9 100644
--- a/src/slang-nodes/OverridePathsDeclaration.ts
+++ b/src/slang-nodes/OverridePathsDeclaration.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { OverridePaths } from './OverridePaths.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class OverridePathsDeclaration implements SlangNode {
   readonly kind = NonterminalKind.OverridePathsDeclaration;
diff --git a/src/slang-nodes/OverrideSpecifier.ts b/src/slang-nodes/OverrideSpecifier.ts
index 714840c86..4fbaedd7e 100644
--- a/src/slang-nodes/OverrideSpecifier.ts
+++ b/src/slang-nodes/OverrideSpecifier.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { OverridePathsDeclaration } from './OverridePathsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class OverrideSpecifier implements SlangNode {
   readonly kind = NonterminalKind.OverrideSpecifier;
diff --git a/src/slang-nodes/Parameter.ts b/src/slang-nodes/Parameter.ts
index eb681c7ea..16e1ffe23 100644
--- a/src/slang-nodes/Parameter.ts
+++ b/src/slang-nodes/Parameter.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
@@ -8,8 +8,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group } = doc.builders;
 
diff --git a/src/slang-nodes/Parameters.ts b/src/slang-nodes/Parameters.ts
index 95c1a953e..d111d3378 100644
--- a/src/slang-nodes/Parameters.ts
+++ b/src/slang-nodes/Parameters.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printComments } from '../slang-printers/print-comments.js';
@@ -7,8 +7,8 @@ import { Parameter } from './Parameter.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class Parameters implements SlangNode {
   readonly kind = NonterminalKind.Parameters;
@@ -32,7 +32,7 @@ export class Parameters implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new Parameter(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/ParametersDeclaration.ts b/src/slang-nodes/ParametersDeclaration.ts
index 7bf92f860..134e26962 100644
--- a/src/slang-nodes/ParametersDeclaration.ts
+++ b/src/slang-nodes/ParametersDeclaration.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Parameters } from './Parameters.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ParametersDeclaration implements SlangNode {
   readonly kind = NonterminalKind.ParametersDeclaration;
diff --git a/src/slang-nodes/PathImport.ts b/src/slang-nodes/PathImport.ts
index 28784aae7..f2994a120 100644
--- a/src/slang-nodes/PathImport.ts
+++ b/src/slang-nodes/PathImport.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StringLiteral } from './StringLiteral.js';
 import { ImportAlias } from './ImportAlias.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class PathImport implements SlangNode {
   readonly kind = NonterminalKind.PathImport;
diff --git a/src/slang-nodes/PositionalArguments.ts b/src/slang-nodes/PositionalArguments.ts
index 465a0540a..8b074106f 100644
--- a/src/slang-nodes/PositionalArguments.ts
+++ b/src/slang-nodes/PositionalArguments.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printComments } from '../slang-printers/print-comments.js';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
@@ -7,8 +7,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class PositionalArguments implements SlangNode {
   readonly kind = NonterminalKind.PositionalArguments;
@@ -32,7 +32,7 @@ export class PositionalArguments implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new Expression(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/PositionalArgumentsDeclaration.ts b/src/slang-nodes/PositionalArgumentsDeclaration.ts
index 37a1ec3d3..2762ac48c 100644
--- a/src/slang-nodes/PositionalArgumentsDeclaration.ts
+++ b/src/slang-nodes/PositionalArgumentsDeclaration.ts
@@ -1,11 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
+import { isBlockComment } from '../slang-utils/is-comment.js';
 import { PositionalArguments } from './PositionalArguments.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class PositionalArgumentsDeclaration implements SlangNode {
   readonly kind = NonterminalKind.PositionalArgumentsDeclaration;
@@ -14,6 +15,8 @@ export class PositionalArgumentsDeclaration implements SlangNode {
 
   loc;
 
+  isEmpty;
+
   arguments: PositionalArguments;
 
   constructor(
@@ -34,6 +37,14 @@ export class PositionalArgumentsDeclaration implements SlangNode {
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
+
+    // We need to check the comments at this point because they will be removed
+    // from this node into the root node.
+    const empty =
+      this.arguments.items.length === 0 && // no arguments
+      !this.comments.some((comment) => isBlockComment(comment)); // no block comments
+
+    this.isEmpty = (): boolean => empty;
   }
 
   print(
diff --git a/src/slang-nodes/PostfixExpression.ts b/src/slang-nodes/PostfixExpression.ts
index 1617613b1..7a5b1a89e 100644
--- a/src/slang-nodes/PostfixExpression.ts
+++ b/src/slang-nodes/PostfixExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class PostfixExpression implements SlangNode {
   readonly kind = NonterminalKind.PostfixExpression;
@@ -27,7 +27,7 @@ export class PostfixExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.operand = new Expression(ast.operand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
 
     metadata = updateMetadata(metadata, [this.operand]);
 
diff --git a/src/slang-nodes/Pragma.ts b/src/slang-nodes/Pragma.ts
index 62504caaf..2138a8dfc 100644
--- a/src/slang-nodes/Pragma.ts
+++ b/src/slang-nodes/Pragma.ts
@@ -1,13 +1,13 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
-import { ABICoderPragma } from './ABICoderPragma.js';
+import { AbicoderPragma } from './AbicoderPragma.js';
 import { ExperimentalPragma } from './ExperimentalPragma.js';
 import { VersionPragma } from './VersionPragma.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class Pragma implements SlangNode {
   readonly kind = NonterminalKind.Pragma;
@@ -16,7 +16,7 @@ export class Pragma implements SlangNode {
 
   loc;
 
-  variant: ABICoderPragma | ExperimentalPragma | VersionPragma;
+  variant: AbicoderPragma | ExperimentalPragma | VersionPragma;
 
   constructor(
     ast: ast.Pragma,
@@ -27,9 +27,9 @@ export class Pragma implements SlangNode {
     const { offsets } = metadata;
 
     switch (ast.variant.cst.kind) {
-      case NonterminalKind.ABICoderPragma:
-        this.variant = new ABICoderPragma(
-          ast.variant as ast.ABICoderPragma,
+      case NonterminalKind.AbicoderPragma:
+        this.variant = new AbicoderPragma(
+          ast.variant as ast.AbicoderPragma,
           offsets[0]
         );
         break;
diff --git a/src/slang-nodes/PragmaDirective.ts b/src/slang-nodes/PragmaDirective.ts
index 5b5ee0d15..b5803bdf3 100644
--- a/src/slang-nodes/PragmaDirective.ts
+++ b/src/slang-nodes/PragmaDirective.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Pragma } from './Pragma.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class PragmaDirective implements SlangNode {
   readonly kind = NonterminalKind.PragmaDirective;
diff --git a/src/slang-nodes/PrefixExpression.ts b/src/slang-nodes/PrefixExpression.ts
index 65f880aa6..24417566b 100644
--- a/src/slang-nodes/PrefixExpression.ts
+++ b/src/slang-nodes/PrefixExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class PrefixExpression implements SlangNode {
   readonly kind = NonterminalKind.PrefixExpression;
@@ -26,7 +26,7 @@ export class PrefixExpression implements SlangNode {
     let metadata = getNodeMetadata(ast, offset);
     const { offsets } = metadata;
 
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.operand = new Expression(ast.operand, offsets[0], options);
 
     metadata = updateMetadata(metadata, [this.operand]);
diff --git a/src/slang-nodes/ReceiveFunctionAttribute.ts b/src/slang-nodes/ReceiveFunctionAttribute.ts
index d529fac22..2eea28ed2 100644
--- a/src/slang-nodes/ReceiveFunctionAttribute.ts
+++ b/src/slang-nodes/ReceiveFunctionAttribute.ts
@@ -1,13 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ReceiveFunctionAttribute implements SlangNode {
   readonly kind = NonterminalKind.ReceiveFunctionAttribute;
@@ -27,7 +26,7 @@ export class ReceiveFunctionAttribute implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
-      this.variant = ast.variant.text;
+      this.variant = ast.variant.unparse();
     } else {
       switch (ast.variant.cst.kind) {
         case NonterminalKind.ModifierInvocation:
diff --git a/src/slang-nodes/ReceiveFunctionAttributes.ts b/src/slang-nodes/ReceiveFunctionAttributes.ts
index 4cf9a1723..e1b914a7d 100644
--- a/src/slang-nodes/ReceiveFunctionAttributes.ts
+++ b/src/slang-nodes/ReceiveFunctionAttributes.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ReceiveFunctionAttribute } from './ReceiveFunctionAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/ReceiveFunctionDefinition.ts b/src/slang-nodes/ReceiveFunctionDefinition.ts
index d71461bbf..d679a5cb3 100644
--- a/src/slang-nodes/ReceiveFunctionDefinition.ts
+++ b/src/slang-nodes/ReceiveFunctionDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -7,8 +7,8 @@ import { FunctionBody } from './FunctionBody.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class ReceiveFunctionDefinition implements SlangNode {
   readonly kind = NonterminalKind.ReceiveFunctionDefinition;
diff --git a/src/slang-nodes/ReturnStatement.ts b/src/slang-nodes/ReturnStatement.ts
index 0050402bf..d978861f8 100644
--- a/src/slang-nodes/ReturnStatement.ts
+++ b/src/slang-nodes/ReturnStatement.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/ReturnsDeclaration.ts b/src/slang-nodes/ReturnsDeclaration.ts
index b9c555902..1263912b0 100644
--- a/src/slang-nodes/ReturnsDeclaration.ts
+++ b/src/slang-nodes/ReturnsDeclaration.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group } = doc.builders;
 
diff --git a/src/slang-nodes/RevertStatement.ts b/src/slang-nodes/RevertStatement.ts
index 999230488..108681c55 100644
--- a/src/slang-nodes/RevertStatement.ts
+++ b/src/slang-nodes/RevertStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { IdentifierPath } from './IdentifierPath.js';
@@ -6,8 +6,8 @@ import { ArgumentsDeclaration } from './ArgumentsDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class RevertStatement implements SlangNode {
   readonly kind = NonterminalKind.RevertStatement;
diff --git a/src/slang-nodes/ShiftExpression.ts b/src/slang-nodes/ShiftExpression.ts
index fe04a3617..21f03f21f 100644
--- a/src/slang-nodes/ShiftExpression.ts
+++ b/src/slang-nodes/ShiftExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printBinaryOperation } from '../slang-printers/print-binary-operation.js';
 import { createHugFunction } from '../slang-utils/create-hug-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const tryToHugLeftOperand = createHugFunction([
   '+',
@@ -42,7 +42,7 @@ export class ShiftExpression implements SlangNode {
     const { offsets } = metadata;
 
     this.leftOperand = new Expression(ast.leftOperand, offsets[0], options);
-    this.operator = ast.operator.text;
+    this.operator = ast.operator.unparse();
     this.rightOperand = new Expression(ast.rightOperand, offsets[1], options);
 
     metadata = updateMetadata(metadata, [this.leftOperand, this.rightOperand]);
diff --git a/src/slang-nodes/SimpleVersionLiteral.ts b/src/slang-nodes/SimpleVersionLiteral.ts
index 848c4c4aa..4e5d854c5 100644
--- a/src/slang-nodes/SimpleVersionLiteral.ts
+++ b/src/slang-nodes/SimpleVersionLiteral.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class SimpleVersionLiteral implements SlangNode {
   readonly kind = NonterminalKind.SimpleVersionLiteral;
@@ -19,8 +19,8 @@ export class SimpleVersionLiteral implements SlangNode {
   constructor(ast: ast.SimpleVersionLiteral, offset: number) {
     const metadata = getNodeMetadata(ast, offset, true);
 
-    this.items = ast.items.map((item) => item.text);
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.items = ast.items.map((item) => item.unparse());
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/SingleLineComment.ts b/src/slang-nodes/SingleLineComment.ts
index bfdd71307..b6862389d 100644
--- a/src/slang-nodes/SingleLineComment.ts
+++ b/src/slang-nodes/SingleLineComment.ts
@@ -1,9 +1,8 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 
 import type { Doc } from 'prettier';
-import type { BaseComment, Location, SlangNode } from '../types';
-import type { StrictAstNode } from '.';
+import type { BaseComment, Location, SlangNode } from '../types.d.ts';
+import type { StrictAstNode } from './types.d.ts';
 
 export class SingleLineComment implements SlangNode, BaseComment {
   readonly kind = TerminalKind.SingleLineComment;
@@ -27,7 +26,7 @@ export class SingleLineComment implements SlangNode, BaseComment {
   followingNode?: StrictAstNode;
 
   constructor(ast: TerminalNode, offset: number) {
-    this.value = ast.text;
+    this.value = ast.unparse();
 
     this.loc = {
       start: offset,
diff --git a/src/slang-nodes/SingleLineNatSpecComment.ts b/src/slang-nodes/SingleLineNatSpecComment.ts
index 9a27af7b8..24a1e75f3 100644
--- a/src/slang-nodes/SingleLineNatSpecComment.ts
+++ b/src/slang-nodes/SingleLineNatSpecComment.ts
@@ -1,9 +1,8 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 
 import type { Doc } from 'prettier';
-import type { BaseComment, Location, SlangNode } from '../types';
-import type { StrictAstNode } from '.';
+import type { BaseComment, Location, SlangNode } from '../types.d.ts';
+import type { StrictAstNode } from './types.d.ts';
 
 export class SingleLineNatSpecComment implements SlangNode, BaseComment {
   readonly kind = TerminalKind.SingleLineNatSpecComment;
@@ -27,7 +26,7 @@ export class SingleLineNatSpecComment implements SlangNode, BaseComment {
   followingNode?: StrictAstNode;
 
   constructor(ast: TerminalNode, offset: number) {
-    this.value = ast.text;
+    this.value = ast.unparse();
 
     this.loc = {
       start: offset,
diff --git a/src/slang-nodes/SourceUnit.ts b/src/slang-nodes/SourceUnit.ts
index 5705b5bb1..8f22f5e80 100644
--- a/src/slang-nodes/SourceUnit.ts
+++ b/src/slang-nodes/SourceUnit.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { SourceUnitMembers } from './SourceUnitMembers.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/SourceUnitMember.ts b/src/slang-nodes/SourceUnitMember.ts
index 7deb86638..fb3eeec70 100644
--- a/src/slang-nodes/SourceUnitMember.ts
+++ b/src/slang-nodes/SourceUnitMember.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { PragmaDirective } from './PragmaDirective.js';
 import { ImportDirective } from './ImportDirective.js';
@@ -16,8 +16,8 @@ import { EventDefinition } from './EventDefinition.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class SourceUnitMember implements SlangNode {
   readonly kind = NonterminalKind.SourceUnitMember;
diff --git a/src/slang-nodes/SourceUnitMembers.ts b/src/slang-nodes/SourceUnitMembers.ts
index a1d0badb5..48c8cae0d 100644
--- a/src/slang-nodes/SourceUnitMembers.ts
+++ b/src/slang-nodes/SourceUnitMembers.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { SourceUnitMember } from './SourceUnitMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class SourceUnitMembers implements SlangNode {
   readonly kind = NonterminalKind.SourceUnitMembers;
diff --git a/src/slang-nodes/StateVariableAttribute.ts b/src/slang-nodes/StateVariableAttribute.ts
index 52d4da220..ec9c205b1 100644
--- a/src/slang-nodes/StateVariableAttribute.ts
+++ b/src/slang-nodes/StateVariableAttribute.ts
@@ -1,11 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class StateVariableAttribute implements SlangNode {
   readonly kind = NonterminalKind.StateVariableAttribute;
@@ -22,7 +21,7 @@ export class StateVariableAttribute implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new OverrideSpecifier(ast.variant, offsets[0]);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/StateVariableAttributes.ts b/src/slang-nodes/StateVariableAttributes.ts
index e8eacbf41..777dd7db0 100644
--- a/src/slang-nodes/StateVariableAttributes.ts
+++ b/src/slang-nodes/StateVariableAttributes.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
@@ -6,7 +6,7 @@ import { StateVariableAttribute } from './StateVariableAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/StateVariableDefinition.ts b/src/slang-nodes/StateVariableDefinition.ts
index c4b01615a..109d677ce 100644
--- a/src/slang-nodes/StateVariableDefinition.ts
+++ b/src/slang-nodes/StateVariableDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
@@ -8,8 +8,8 @@ import { StateVariableDefinitionValue } from './StateVariableDefinitionValue.js'
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, indentIfBreak } = doc.builders;
 
diff --git a/src/slang-nodes/StateVariableDefinitionValue.ts b/src/slang-nodes/StateVariableDefinitionValue.ts
index d882b418a..c9382c03b 100644
--- a/src/slang-nodes/StateVariableDefinitionValue.ts
+++ b/src/slang-nodes/StateVariableDefinitionValue.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/Statement.ts b/src/slang-nodes/Statement.ts
index 01fb2a085..3293b94e5 100644
--- a/src/slang-nodes/Statement.ts
+++ b/src/slang-nodes/Statement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 import { VariableDeclarationStatement } from './VariableDeclarationStatement.js';
@@ -20,8 +20,8 @@ import { UncheckedBlock } from './UncheckedBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class Statement implements SlangNode {
   readonly kind = NonterminalKind.Statement;
diff --git a/src/slang-nodes/Statements.ts b/src/slang-nodes/Statements.ts
index f61c362d7..24d061320 100644
--- a/src/slang-nodes/Statements.ts
+++ b/src/slang-nodes/Statements.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printComments } from '../slang-printers/print-comments.js';
 import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js';
@@ -8,8 +8,8 @@ import { Statement } from './Statement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
@@ -52,10 +52,7 @@ export class Statements implements SlangNode {
             printPreservingEmptyLines(path, print, options),
             printComments(path)
           ],
-          {
-            firstSeparator: hardline,
-            grouped: false
-          }
+          { firstSeparator: hardline, grouped: false }
         );
   }
 }
diff --git a/src/slang-nodes/StorageLocation.ts b/src/slang-nodes/StorageLocation.ts
index b7155f961..9438821da 100644
--- a/src/slang-nodes/StorageLocation.ts
+++ b/src/slang-nodes/StorageLocation.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class StorageLocation implements SlangNode {
   readonly kind = NonterminalKind.StorageLocation;
@@ -17,7 +17,7 @@ export class StorageLocation implements SlangNode {
   constructor(ast: ast.StorageLocation, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/StringExpression.ts b/src/slang-nodes/StringExpression.ts
index 1509d634d..c0d5508ff 100644
--- a/src/slang-nodes/StringExpression.ts
+++ b/src/slang-nodes/StringExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StringLiteral } from './StringLiteral.js';
 import { StringLiterals } from './StringLiterals.js';
@@ -8,8 +8,8 @@ import { UnicodeStringLiterals } from './UnicodeStringLiterals.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class StringExpression implements SlangNode {
   readonly kind = NonterminalKind.StringExpression;
@@ -55,7 +55,6 @@ export class StringExpression implements SlangNode {
           options
         );
         break;
-
       case NonterminalKind.HexStringLiterals:
         this.variant = new HexStringLiterals(
           ast.variant as ast.HexStringLiterals,
diff --git a/src/slang-nodes/StringLiteral.ts b/src/slang-nodes/StringLiteral.ts
index ef8a2357b..ef096a94f 100644
--- a/src/slang-nodes/StringLiteral.ts
+++ b/src/slang-nodes/StringLiteral.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printString } from '../slang-printers/print-string.js';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { SlangNode } from '../types.d.ts';
 
 export class StringLiteral implements SlangNode {
   readonly kind = NonterminalKind.StringLiteral;
@@ -23,7 +23,7 @@ export class StringLiteral implements SlangNode {
   ) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/StringLiterals.ts b/src/slang-nodes/StringLiterals.ts
index 790297771..b55b617e2 100644
--- a/src/slang-nodes/StringLiterals.ts
+++ b/src/slang-nodes/StringLiterals.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StringLiteral } from './StringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join, hardline } = doc.builders;
 
diff --git a/src/slang-nodes/StructDefinition.ts b/src/slang-nodes/StructDefinition.ts
index bbf01ea68..a3e0e6b8d 100644
--- a/src/slang-nodes/StructDefinition.ts
+++ b/src/slang-nodes/StructDefinition.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { StructMembers } from './StructMembers.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class StructDefinition implements SlangNode {
   readonly kind = NonterminalKind.StructDefinition;
diff --git a/src/slang-nodes/StructMember.ts b/src/slang-nodes/StructMember.ts
index 0bde43135..7d439f310 100644
--- a/src/slang-nodes/StructMember.ts
+++ b/src/slang-nodes/StructMember.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class StructMember implements SlangNode {
   readonly kind = NonterminalKind.StructMember;
diff --git a/src/slang-nodes/StructMembers.ts b/src/slang-nodes/StructMembers.ts
index 820a9840c..a57ac04f5 100644
--- a/src/slang-nodes/StructMembers.ts
+++ b/src/slang-nodes/StructMembers.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { StructMember } from './StructMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
diff --git a/src/slang-nodes/ThrowStatement.ts b/src/slang-nodes/ThrowStatement.ts
index d17b4794e..ca9cbe9fe 100644
--- a/src/slang-nodes/ThrowStatement.ts
+++ b/src/slang-nodes/ThrowStatement.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class ThrowStatement implements SlangNode {
   readonly kind = NonterminalKind.ThrowStatement;
diff --git a/src/slang-nodes/TryStatement.ts b/src/slang-nodes/TryStatement.ts
index 6621a697c..18ed8e943 100644
--- a/src/slang-nodes/TryStatement.ts
+++ b/src/slang-nodes/TryStatement.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
@@ -10,8 +10,8 @@ import { CatchClauses } from './CatchClauses.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/TupleDeconstructionElement.ts b/src/slang-nodes/TupleDeconstructionElement.ts
index 160191d13..ce6193811 100644
--- a/src/slang-nodes/TupleDeconstructionElement.ts
+++ b/src/slang-nodes/TupleDeconstructionElement.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TupleMember } from './TupleMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TupleDeconstructionElement implements SlangNode {
   readonly kind = NonterminalKind.TupleDeconstructionElement;
diff --git a/src/slang-nodes/TupleDeconstructionElements.ts b/src/slang-nodes/TupleDeconstructionElements.ts
index c4eb67fd3..2f1735a94 100644
--- a/src/slang-nodes/TupleDeconstructionElements.ts
+++ b/src/slang-nodes/TupleDeconstructionElements.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TupleDeconstructionElement } from './TupleDeconstructionElement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TupleDeconstructionElements implements SlangNode {
   readonly kind = NonterminalKind.TupleDeconstructionElements;
@@ -31,7 +31,7 @@ export class TupleDeconstructionElements implements SlangNode {
       (item, index) =>
         new TupleDeconstructionElement(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/TupleDeconstructionStatement.ts b/src/slang-nodes/TupleDeconstructionStatement.ts
index 1464cdb6d..74572fef5 100644
--- a/src/slang-nodes/TupleDeconstructionStatement.ts
+++ b/src/slang-nodes/TupleDeconstructionStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TupleDeconstructionElements } from './TupleDeconstructionElements.js';
@@ -6,8 +6,8 @@ import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indentIfBreak } = doc.builders;
 
@@ -32,7 +32,7 @@ export class TupleDeconstructionStatement implements SlangNode {
     let metadata = getNodeMetadata(ast, offset);
     const { offsets } = metadata;
 
-    this.varKeyword = ast.varKeyword?.text;
+    this.varKeyword = ast.varKeyword?.unparse();
     this.elements = new TupleDeconstructionElements(
       ast.elements,
       offsets[0],
diff --git a/src/slang-nodes/TupleExpression.ts b/src/slang-nodes/TupleExpression.ts
index 1cb523f97..25c3ae45b 100644
--- a/src/slang-nodes/TupleExpression.ts
+++ b/src/slang-nodes/TupleExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TupleValues } from './TupleValues.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TupleExpression implements SlangNode {
   readonly kind = NonterminalKind.TupleExpression;
diff --git a/src/slang-nodes/TupleMember.ts b/src/slang-nodes/TupleMember.ts
index e117f7763..74e768d84 100644
--- a/src/slang-nodes/TupleMember.ts
+++ b/src/slang-nodes/TupleMember.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypedTupleMember } from './TypedTupleMember.js';
 import { UntypedTupleMember } from './UntypedTupleMember.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TupleMember implements SlangNode {
   readonly kind = NonterminalKind.TupleMember;
diff --git a/src/slang-nodes/TupleValue.ts b/src/slang-nodes/TupleValue.ts
index ea5faf37e..e2299076e 100644
--- a/src/slang-nodes/TupleValue.ts
+++ b/src/slang-nodes/TupleValue.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TupleValue implements SlangNode {
   readonly kind = NonterminalKind.TupleValue;
diff --git a/src/slang-nodes/TupleValues.ts b/src/slang-nodes/TupleValues.ts
index cd0de9682..4c34521c6 100644
--- a/src/slang-nodes/TupleValues.ts
+++ b/src/slang-nodes/TupleValues.ts
@@ -1,7 +1,4 @@
-import {
-  NonterminalKind,
-  TerminalKind
-} from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
@@ -9,8 +6,8 @@ import { TupleValue } from './TupleValue.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TupleValues implements SlangNode {
   readonly kind = NonterminalKind.TupleValues;
@@ -34,7 +31,7 @@ export class TupleValues implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new TupleValue(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/TypeExpression.ts b/src/slang-nodes/TypeExpression.ts
index 17ab402ac..945996d50 100644
--- a/src/slang-nodes/TypeExpression.ts
+++ b/src/slang-nodes/TypeExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TypeExpression implements SlangNode {
   readonly kind = NonterminalKind.TypeExpression;
diff --git a/src/slang-nodes/TypeName.ts b/src/slang-nodes/TypeName.ts
index ab0a0fef2..64c32f949 100644
--- a/src/slang-nodes/TypeName.ts
+++ b/src/slang-nodes/TypeName.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ArrayTypeName } from './ArrayTypeName.js';
 import { FunctionType } from './FunctionType.js';
@@ -8,8 +8,8 @@ import { IdentifierPath } from './IdentifierPath.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TypeName implements SlangNode {
   readonly kind = NonterminalKind.TypeName;
diff --git a/src/slang-nodes/TypedTupleMember.ts b/src/slang-nodes/TypedTupleMember.ts
index 04d72ca2b..5a08e7236 100644
--- a/src/slang-nodes/TypedTupleMember.ts
+++ b/src/slang-nodes/TypedTupleMember.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { TypeName } from './TypeName.js';
@@ -7,8 +7,8 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class TypedTupleMember implements SlangNode {
   readonly kind = NonterminalKind.TypedTupleMember;
diff --git a/src/slang-nodes/UncheckedBlock.ts b/src/slang-nodes/UncheckedBlock.ts
index ab24ec20a..a8dd483c6 100644
--- a/src/slang-nodes/UncheckedBlock.ts
+++ b/src/slang-nodes/UncheckedBlock.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Block } from './Block.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UncheckedBlock implements SlangNode {
   readonly kind = NonterminalKind.UncheckedBlock;
diff --git a/src/slang-nodes/UnicodeStringLiteral.ts b/src/slang-nodes/UnicodeStringLiteral.ts
index e36d2f09a..f5a5e55f4 100644
--- a/src/slang-nodes/UnicodeStringLiteral.ts
+++ b/src/slang-nodes/UnicodeStringLiteral.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printString } from '../slang-printers/print-string.js';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { SlangNode } from '../types.d.ts';
 
 export class UnicodeStringLiteral implements SlangNode {
   readonly kind = NonterminalKind.UnicodeStringLiteral;
@@ -23,7 +23,7 @@ export class UnicodeStringLiteral implements SlangNode {
   ) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/UnicodeStringLiterals.ts b/src/slang-nodes/UnicodeStringLiterals.ts
index 7155de634..5e23cbc18 100644
--- a/src/slang-nodes/UnicodeStringLiterals.ts
+++ b/src/slang-nodes/UnicodeStringLiterals.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { UnicodeStringLiteral } from './UnicodeStringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join, hardline } = doc.builders;
 
diff --git a/src/slang-nodes/UnnamedFunctionAttribute.ts b/src/slang-nodes/UnnamedFunctionAttribute.ts
index a4786c412..87f2656d6 100644
--- a/src/slang-nodes/UnnamedFunctionAttribute.ts
+++ b/src/slang-nodes/UnnamedFunctionAttribute.ts
@@ -1,12 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UnnamedFunctionAttribute implements SlangNode {
   readonly kind = NonterminalKind.UnnamedFunctionAttribute;
@@ -27,7 +26,7 @@ export class UnnamedFunctionAttribute implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new ModifierInvocation(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/UnnamedFunctionAttributes.ts b/src/slang-nodes/UnnamedFunctionAttributes.ts
index 63568513a..8d379fdd2 100644
--- a/src/slang-nodes/UnnamedFunctionAttributes.ts
+++ b/src/slang-nodes/UnnamedFunctionAttributes.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { sortFunctionAttributes } from '../slang-utils/sort-function-attributes.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { UnnamedFunctionAttribute } from './UnnamedFunctionAttribute.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/UnnamedFunctionDefinition.ts b/src/slang-nodes/UnnamedFunctionDefinition.ts
index c83af05fb..14a23dfc8 100644
--- a/src/slang-nodes/UnnamedFunctionDefinition.ts
+++ b/src/slang-nodes/UnnamedFunctionDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printFunction } from '../slang-printers/print-function.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -7,8 +7,8 @@ import { FunctionBody } from './FunctionBody.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UnnamedFunctionDefinition implements SlangNode {
   readonly kind = NonterminalKind.UnnamedFunctionDefinition;
diff --git a/src/slang-nodes/UntypedTupleMember.ts b/src/slang-nodes/UntypedTupleMember.ts
index 7913be02e..4bf1483aa 100644
--- a/src/slang-nodes/UntypedTupleMember.ts
+++ b/src/slang-nodes/UntypedTupleMember.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { StorageLocation } from './StorageLocation.js';
@@ -6,7 +6,7 @@ import { Identifier } from './Identifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UntypedTupleMember implements SlangNode {
   readonly kind = NonterminalKind.UntypedTupleMember;
diff --git a/src/slang-nodes/UserDefinedValueTypeDefinition.ts b/src/slang-nodes/UserDefinedValueTypeDefinition.ts
index 14cad8e9b..58ff04fd0 100644
--- a/src/slang-nodes/UserDefinedValueTypeDefinition.ts
+++ b/src/slang-nodes/UserDefinedValueTypeDefinition.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Identifier } from './Identifier.js';
 import { ElementaryType } from './ElementaryType.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UserDefinedValueTypeDefinition implements SlangNode {
   readonly kind = NonterminalKind.UserDefinedValueTypeDefinition;
diff --git a/src/slang-nodes/UsingAlias.ts b/src/slang-nodes/UsingAlias.ts
index 3396719af..9d6f684c5 100644
--- a/src/slang-nodes/UsingAlias.ts
+++ b/src/slang-nodes/UsingAlias.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { UsingOperator } from './UsingOperator.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UsingAlias implements SlangNode {
   readonly kind = NonterminalKind.UsingAlias;
diff --git a/src/slang-nodes/UsingClause.ts b/src/slang-nodes/UsingClause.ts
index 700257229..29729b8e8 100644
--- a/src/slang-nodes/UsingClause.ts
+++ b/src/slang-nodes/UsingClause.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { IdentifierPath } from './IdentifierPath.js';
 import { UsingDeconstruction } from './UsingDeconstruction.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UsingClause implements SlangNode {
   readonly kind = NonterminalKind.UsingClause;
diff --git a/src/slang-nodes/UsingDeconstruction.ts b/src/slang-nodes/UsingDeconstruction.ts
index 1a75b255f..c293a8aab 100644
--- a/src/slang-nodes/UsingDeconstruction.ts
+++ b/src/slang-nodes/UsingDeconstruction.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { UsingDeconstructionSymbols } from './UsingDeconstructionSymbols.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UsingDeconstruction implements SlangNode {
   readonly kind = NonterminalKind.UsingDeconstruction;
diff --git a/src/slang-nodes/UsingDeconstructionSymbol.ts b/src/slang-nodes/UsingDeconstructionSymbol.ts
index d5430dd9b..c45bdf268 100644
--- a/src/slang-nodes/UsingDeconstructionSymbol.ts
+++ b/src/slang-nodes/UsingDeconstructionSymbol.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { IdentifierPath } from './IdentifierPath.js';
 import { UsingAlias } from './UsingAlias.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UsingDeconstructionSymbol implements SlangNode {
   readonly kind = NonterminalKind.UsingDeconstructionSymbol;
diff --git a/src/slang-nodes/UsingDeconstructionSymbols.ts b/src/slang-nodes/UsingDeconstructionSymbols.ts
index 60a9968bc..fecbad908 100644
--- a/src/slang-nodes/UsingDeconstructionSymbols.ts
+++ b/src/slang-nodes/UsingDeconstructionSymbols.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { UsingDeconstructionSymbol } from './UsingDeconstructionSymbol.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line, softline } = doc.builders;
 
@@ -29,7 +29,7 @@ export class UsingDeconstructionSymbols implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new UsingDeconstructionSymbol(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/UsingDirective.ts b/src/slang-nodes/UsingDirective.ts
index 6fd4e6ce0..10613e52c 100644
--- a/src/slang-nodes/UsingDirective.ts
+++ b/src/slang-nodes/UsingDirective.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { UsingClause } from './UsingClause.js';
@@ -6,8 +6,8 @@ import { UsingTarget } from './UsingTarget.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UsingDirective implements SlangNode {
   readonly kind = NonterminalKind.UsingDirective;
@@ -32,7 +32,7 @@ export class UsingDirective implements SlangNode {
 
     this.clause = new UsingClause(ast.clause, offsets[0]);
     this.target = new UsingTarget(ast.target, offsets[1], options);
-    this.globalKeyword = ast.globalKeyword?.text;
+    this.globalKeyword = ast.globalKeyword?.unparse();
 
     metadata = updateMetadata(metadata, [this.clause, this.target]);
 
diff --git a/src/slang-nodes/UsingOperator.ts b/src/slang-nodes/UsingOperator.ts
index e0e36081c..73a127509 100644
--- a/src/slang-nodes/UsingOperator.ts
+++ b/src/slang-nodes/UsingOperator.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class UsingOperator implements SlangNode {
   readonly kind = NonterminalKind.UsingOperator;
@@ -17,7 +17,7 @@ export class UsingOperator implements SlangNode {
   constructor(ast: ast.UsingOperator, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/UsingTarget.ts b/src/slang-nodes/UsingTarget.ts
index d33b82699..2bdef0050 100644
--- a/src/slang-nodes/UsingTarget.ts
+++ b/src/slang-nodes/UsingTarget.ts
@@ -1,12 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class UsingTarget implements SlangNode {
   readonly kind = NonterminalKind.UsingTarget;
@@ -27,7 +26,7 @@ export class UsingTarget implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new TypeName(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/VariableDeclarationStatement.ts b/src/slang-nodes/VariableDeclarationStatement.ts
index ab743bac6..1c3329dcb 100644
--- a/src/slang-nodes/VariableDeclarationStatement.ts
+++ b/src/slang-nodes/VariableDeclarationStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VariableDeclarationType } from './VariableDeclarationType.js';
@@ -8,8 +8,8 @@ import { VariableDeclarationValue } from './VariableDeclarationValue.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, indentIfBreak, line } = doc.builders;
 
@@ -85,9 +85,7 @@ export class VariableDeclarationStatement implements SlangNode {
 
     return [
       declarationDoc,
-      indentIfBreak(path.call(print, 'value'), {
-        groupId: declarationDoc.id!
-      }),
+      indentIfBreak(path.call(print, 'value'), { groupId: declarationDoc.id! }),
       ';'
     ];
   }
diff --git a/src/slang-nodes/VariableDeclarationType.ts b/src/slang-nodes/VariableDeclarationType.ts
index 526de97f0..d4d61642c 100644
--- a/src/slang-nodes/VariableDeclarationType.ts
+++ b/src/slang-nodes/VariableDeclarationType.ts
@@ -1,12 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { TypeName } from './TypeName.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VariableDeclarationType implements SlangNode {
   readonly kind = NonterminalKind.VariableDeclarationType;
@@ -27,7 +26,7 @@ export class VariableDeclarationType implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new TypeName(ast.variant, offsets[0], options);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/VariableDeclarationValue.ts b/src/slang-nodes/VariableDeclarationValue.ts
index 240e89d1a..a6cfc0325 100644
--- a/src/slang-nodes/VariableDeclarationValue.ts
+++ b/src/slang-nodes/VariableDeclarationValue.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VariableDeclarationValue implements SlangNode {
   readonly kind = NonterminalKind.VariableDeclarationValue;
diff --git a/src/slang-nodes/VersionExpression.ts b/src/slang-nodes/VersionExpression.ts
index f72e7ec70..84f781469 100644
--- a/src/slang-nodes/VersionExpression.ts
+++ b/src/slang-nodes/VersionExpression.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VersionRange } from './VersionRange.js';
 import { VersionTerm } from './VersionTerm.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VersionExpression implements SlangNode {
   readonly kind = NonterminalKind.VersionExpression;
diff --git a/src/slang-nodes/VersionExpressionSet.ts b/src/slang-nodes/VersionExpressionSet.ts
index 7a4972fbe..4b11eb8a9 100644
--- a/src/slang-nodes/VersionExpressionSet.ts
+++ b/src/slang-nodes/VersionExpressionSet.ts
@@ -1,11 +1,11 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VersionExpression } from './VersionExpression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join } = doc.builders;
 
diff --git a/src/slang-nodes/VersionExpressionSets.ts b/src/slang-nodes/VersionExpressionSets.ts
index dee0688e6..d2fdc7a71 100644
--- a/src/slang-nodes/VersionExpressionSets.ts
+++ b/src/slang-nodes/VersionExpressionSets.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VersionExpressionSet } from './VersionExpressionSet.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VersionExpressionSets implements SlangNode {
   readonly kind = NonterminalKind.VersionExpressionSets;
@@ -24,7 +24,7 @@ export class VersionExpressionSets implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new VersionExpressionSet(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/VersionLiteral.ts b/src/slang-nodes/VersionLiteral.ts
index 1990abe26..c393d7ee8 100644
--- a/src/slang-nodes/VersionLiteral.ts
+++ b/src/slang-nodes/VersionLiteral.ts
@@ -1,11 +1,10 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { SimpleVersionLiteral } from './SimpleVersionLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VersionLiteral implements SlangNode {
   readonly kind = NonterminalKind.VersionLiteral;
@@ -22,7 +21,7 @@ export class VersionLiteral implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new SimpleVersionLiteral(ast.variant, offsets[0]);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/VersionOperator.ts b/src/slang-nodes/VersionOperator.ts
index 25394187a..908848ba5 100644
--- a/src/slang-nodes/VersionOperator.ts
+++ b/src/slang-nodes/VersionOperator.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class VersionOperator implements SlangNode {
   readonly kind = NonterminalKind.VersionOperator;
@@ -17,7 +17,7 @@ export class VersionOperator implements SlangNode {
   constructor(ast: ast.VersionOperator, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/VersionPragma.ts b/src/slang-nodes/VersionPragma.ts
index fdd2f812e..22984bd13 100644
--- a/src/slang-nodes/VersionPragma.ts
+++ b/src/slang-nodes/VersionPragma.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VersionExpressionSets } from './VersionExpressionSets.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VersionPragma implements SlangNode {
   readonly kind = NonterminalKind.VersionPragma;
diff --git a/src/slang-nodes/VersionRange.ts b/src/slang-nodes/VersionRange.ts
index ba3a8f491..ff1e83e11 100644
--- a/src/slang-nodes/VersionRange.ts
+++ b/src/slang-nodes/VersionRange.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VersionLiteral } from './VersionLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VersionRange implements SlangNode {
   readonly kind = NonterminalKind.VersionRange;
diff --git a/src/slang-nodes/VersionTerm.ts b/src/slang-nodes/VersionTerm.ts
index 6c312e806..a24ab188a 100644
--- a/src/slang-nodes/VersionTerm.ts
+++ b/src/slang-nodes/VersionTerm.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { VersionOperator } from './VersionOperator.js';
 import { VersionLiteral } from './VersionLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class VersionTerm implements SlangNode {
   readonly kind = NonterminalKind.VersionTerm;
diff --git a/src/slang-nodes/WhileStatement.ts b/src/slang-nodes/WhileStatement.ts
index 95111fd92..ff5cba8df 100644
--- a/src/slang-nodes/WhileStatement.ts
+++ b/src/slang-nodes/WhileStatement.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { Expression } from './Expression.js';
@@ -7,8 +7,8 @@ import { Statement } from './Statement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, indent, line } = doc.builders;
 
diff --git a/src/slang-nodes/YulArguments.ts b/src/slang-nodes/YulArguments.ts
index ba2de2f02..6d0ea5a01 100644
--- a/src/slang-nodes/YulArguments.ts
+++ b/src/slang-nodes/YulArguments.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulExpression } from './YulExpression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulArguments implements SlangNode {
   readonly kind = NonterminalKind.YulArguments;
@@ -30,7 +30,7 @@ export class YulArguments implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new YulExpression(item, offsets[index], options)
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/YulAssignmentOperator.ts b/src/slang-nodes/YulAssignmentOperator.ts
index eb7efcbb2..41483b805 100644
--- a/src/slang-nodes/YulAssignmentOperator.ts
+++ b/src/slang-nodes/YulAssignmentOperator.ts
@@ -1,11 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulColonAndEqual } from './YulColonAndEqual.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulAssignmentOperator implements SlangNode {
   readonly kind = NonterminalKind.YulAssignmentOperator;
@@ -22,7 +21,7 @@ export class YulAssignmentOperator implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new YulColonAndEqual(ast.variant, offsets[0]);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/YulBlock.ts b/src/slang-nodes/YulBlock.ts
index 2e38c4de8..c068b5437 100644
--- a/src/slang-nodes/YulBlock.ts
+++ b/src/slang-nodes/YulBlock.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulStatements } from './YulStatements.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulBlock implements SlangNode {
   readonly kind = NonterminalKind.YulBlock;
diff --git a/src/slang-nodes/YulBreakStatement.ts b/src/slang-nodes/YulBreakStatement.ts
index efe3cb52a..98b82f6f6 100644
--- a/src/slang-nodes/YulBreakStatement.ts
+++ b/src/slang-nodes/YulBreakStatement.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class YulBreakStatement implements SlangNode {
   readonly kind = NonterminalKind.YulBreakStatement;
diff --git a/src/slang-nodes/YulBuiltInFunction.ts b/src/slang-nodes/YulBuiltInFunction.ts
index 4df02fb54..d273b6b2b 100644
--- a/src/slang-nodes/YulBuiltInFunction.ts
+++ b/src/slang-nodes/YulBuiltInFunction.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class YulBuiltInFunction implements SlangNode {
   readonly kind = NonterminalKind.YulBuiltInFunction;
@@ -17,7 +17,7 @@ export class YulBuiltInFunction implements SlangNode {
   constructor(ast: ast.YulBuiltInFunction, offset: number) {
     const metadata = getNodeMetadata(ast, offset);
 
-    this.variant = ast.variant.text;
+    this.variant = ast.variant.unparse();
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/YulColonAndEqual.ts b/src/slang-nodes/YulColonAndEqual.ts
index ed7fe8bc0..8c404a063 100644
--- a/src/slang-nodes/YulColonAndEqual.ts
+++ b/src/slang-nodes/YulColonAndEqual.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class YulColonAndEqual implements SlangNode {
   readonly kind = NonterminalKind.YulColonAndEqual;
diff --git a/src/slang-nodes/YulContinueStatement.ts b/src/slang-nodes/YulContinueStatement.ts
index aecfa89c7..f1ac9e41b 100644
--- a/src/slang-nodes/YulContinueStatement.ts
+++ b/src/slang-nodes/YulContinueStatement.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class YulContinueStatement implements SlangNode {
   readonly kind = NonterminalKind.YulContinueStatement;
diff --git a/src/slang-nodes/YulDefaultCase.ts b/src/slang-nodes/YulDefaultCase.ts
index db189a62e..0ed28ae29 100644
--- a/src/slang-nodes/YulDefaultCase.ts
+++ b/src/slang-nodes/YulDefaultCase.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulBlock } from './YulBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulDefaultCase implements SlangNode {
   readonly kind = NonterminalKind.YulDefaultCase;
diff --git a/src/slang-nodes/YulEqualAndColon.ts b/src/slang-nodes/YulEqualAndColon.ts
index ab138530f..64af16b0c 100644
--- a/src/slang-nodes/YulEqualAndColon.ts
+++ b/src/slang-nodes/YulEqualAndColon.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class YulEqualAndColon implements SlangNode {
   readonly kind = NonterminalKind.YulEqualAndColon;
diff --git a/src/slang-nodes/YulExpression.ts b/src/slang-nodes/YulExpression.ts
index 662eda547..221b8bedb 100644
--- a/src/slang-nodes/YulExpression.ts
+++ b/src/slang-nodes/YulExpression.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulFunctionCallExpression } from './YulFunctionCallExpression.js';
 import { YulLiteral } from './YulLiteral.js';
@@ -7,8 +7,8 @@ import { YulPath } from './YulPath.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulExpression implements SlangNode {
   readonly kind = NonterminalKind.YulExpression;
diff --git a/src/slang-nodes/YulForStatement.ts b/src/slang-nodes/YulForStatement.ts
index e45471c1c..cd6683d6a 100644
--- a/src/slang-nodes/YulForStatement.ts
+++ b/src/slang-nodes/YulForStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulBlock } from './YulBlock.js';
@@ -6,8 +6,8 @@ import { YulExpression } from './YulExpression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join } = doc.builders;
 
diff --git a/src/slang-nodes/YulFunctionCallExpression.ts b/src/slang-nodes/YulFunctionCallExpression.ts
index 8302acfe4..fcf1bc4c8 100644
--- a/src/slang-nodes/YulFunctionCallExpression.ts
+++ b/src/slang-nodes/YulFunctionCallExpression.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulExpression } from './YulExpression.js';
 import { YulArguments } from './YulArguments.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulFunctionCallExpression implements SlangNode {
   readonly kind = NonterminalKind.YulFunctionCallExpression;
diff --git a/src/slang-nodes/YulFunctionDefinition.ts b/src/slang-nodes/YulFunctionDefinition.ts
index 3388e4376..0f46557c8 100644
--- a/src/slang-nodes/YulFunctionDefinition.ts
+++ b/src/slang-nodes/YulFunctionDefinition.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulIdentifier } from './YulIdentifier.js';
 import { YulParametersDeclaration } from './YulParametersDeclaration.js';
@@ -7,8 +7,8 @@ import { YulBlock } from './YulBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulFunctionDefinition implements SlangNode {
   readonly kind = NonterminalKind.YulFunctionDefinition;
diff --git a/src/slang-nodes/YulIdentifier.ts b/src/slang-nodes/YulIdentifier.ts
index 855117acb..ea3e8ad4b 100644
--- a/src/slang-nodes/YulIdentifier.ts
+++ b/src/slang-nodes/YulIdentifier.ts
@@ -1,9 +1,8 @@
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 
 import type { Doc } from 'prettier';
-import type { Location, SlangNode } from '../types';
-import type { Comment } from '.';
+import type { Location, SlangNode } from '../types.d.ts';
+import type { Comment } from './types.d.ts';
 
 export class YulIdentifier implements SlangNode {
   readonly kind = TerminalKind.YulIdentifier;
@@ -15,7 +14,7 @@ export class YulIdentifier implements SlangNode {
   value: string;
 
   constructor(ast: TerminalNode, offset: number) {
-    this.value = ast.text;
+    this.value = ast.unparse();
 
     this.comments = [];
     this.loc = {
diff --git a/src/slang-nodes/YulIfStatement.ts b/src/slang-nodes/YulIfStatement.ts
index a5d86d1d1..9461c795c 100644
--- a/src/slang-nodes/YulIfStatement.ts
+++ b/src/slang-nodes/YulIfStatement.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulExpression } from './YulExpression.js';
 import { YulBlock } from './YulBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulIfStatement implements SlangNode {
   readonly kind = NonterminalKind.YulIfStatement;
diff --git a/src/slang-nodes/YulLabel.ts b/src/slang-nodes/YulLabel.ts
index f93fd9c01..b8c943e70 100644
--- a/src/slang-nodes/YulLabel.ts
+++ b/src/slang-nodes/YulLabel.ts
@@ -1,11 +1,11 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { YulIdentifier } from './YulIdentifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { dedent, line } = doc.builders;
 
diff --git a/src/slang-nodes/YulLeaveStatement.ts b/src/slang-nodes/YulLeaveStatement.ts
index de493c5e1..c07891731 100644
--- a/src/slang-nodes/YulLeaveStatement.ts
+++ b/src/slang-nodes/YulLeaveStatement.ts
@@ -1,9 +1,9 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { Doc } from 'prettier';
-import type { SlangNode } from '../types';
+import type { SlangNode } from '../types.d.ts';
 
 export class YulLeaveStatement implements SlangNode {
   readonly kind = NonterminalKind.YulLeaveStatement;
diff --git a/src/slang-nodes/YulLiteral.ts b/src/slang-nodes/YulLiteral.ts
index a88f1281c..f4355b981 100644
--- a/src/slang-nodes/YulLiteral.ts
+++ b/src/slang-nodes/YulLiteral.ts
@@ -1,13 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { HexStringLiteral } from './HexStringLiteral.js';
 import { StringLiteral } from './StringLiteral.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulLiteral implements SlangNode {
   readonly kind = NonterminalKind.YulLiteral;
@@ -27,7 +26,7 @@ export class YulLiteral implements SlangNode {
     const { offsets } = metadata;
 
     if (ast.variant instanceof TerminalNode) {
-      this.variant = ast.variant.text;
+      this.variant = ast.variant.unparse();
     } else {
       switch (ast.variant.cst.kind) {
         case NonterminalKind.HexStringLiteral:
diff --git a/src/slang-nodes/YulParameters.ts b/src/slang-nodes/YulParameters.ts
index d3b3d403e..36b4ee384 100644
--- a/src/slang-nodes/YulParameters.ts
+++ b/src/slang-nodes/YulParameters.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { YulIdentifier } from './YulIdentifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulParameters implements SlangNode {
   readonly kind = NonterminalKind.YulParameters;
@@ -25,7 +25,7 @@ export class YulParameters implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new YulIdentifier(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/YulParametersDeclaration.ts b/src/slang-nodes/YulParametersDeclaration.ts
index 5988031af..496a91bd0 100644
--- a/src/slang-nodes/YulParametersDeclaration.ts
+++ b/src/slang-nodes/YulParametersDeclaration.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulParameters } from './YulParameters.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulParametersDeclaration implements SlangNode {
   readonly kind = NonterminalKind.YulParametersDeclaration;
diff --git a/src/slang-nodes/YulPath.ts b/src/slang-nodes/YulPath.ts
index ba8943f4d..d2de2ad5f 100644
--- a/src/slang-nodes/YulPath.ts
+++ b/src/slang-nodes/YulPath.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulPathComponent } from './YulPathComponent.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulPath implements SlangNode {
   readonly kind = NonterminalKind.YulPath;
@@ -24,7 +24,7 @@ export class YulPath implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new YulPathComponent(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/YulPathComponent.ts b/src/slang-nodes/YulPathComponent.ts
index 39786f944..3fef0c280 100644
--- a/src/slang-nodes/YulPathComponent.ts
+++ b/src/slang-nodes/YulPathComponent.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
 import { YulIdentifier } from './YulIdentifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulPathComponent implements SlangNode {
   readonly kind = NonterminalKind.YulPathComponent;
diff --git a/src/slang-nodes/YulPaths.ts b/src/slang-nodes/YulPaths.ts
index 66c4f4d7d..bbc366113 100644
--- a/src/slang-nodes/YulPaths.ts
+++ b/src/slang-nodes/YulPaths.ts
@@ -1,10 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulPath } from './YulPath.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulPaths implements SlangNode {
   readonly kind = NonterminalKind.YulPaths;
@@ -24,7 +24,7 @@ export class YulPaths implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new YulPath(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     metadata = updateMetadata(metadata, [this.items]);
 
diff --git a/src/slang-nodes/YulReturnsDeclaration.ts b/src/slang-nodes/YulReturnsDeclaration.ts
index c3d25c077..dc045beb6 100644
--- a/src/slang-nodes/YulReturnsDeclaration.ts
+++ b/src/slang-nodes/YulReturnsDeclaration.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulVariableNames } from './YulVariableNames.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/YulStackAssignmentOperator.ts b/src/slang-nodes/YulStackAssignmentOperator.ts
index 7f0e5d113..477f9a739 100644
--- a/src/slang-nodes/YulStackAssignmentOperator.ts
+++ b/src/slang-nodes/YulStackAssignmentOperator.ts
@@ -1,11 +1,10 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { TerminalNode } from '@nomicfoundation/slang/cst/index.js';
+import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulEqualAndColon } from './YulEqualAndColon.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulStackAssignmentOperator implements SlangNode {
   readonly kind = NonterminalKind.YulStackAssignmentOperator;
@@ -22,7 +21,7 @@ export class YulStackAssignmentOperator implements SlangNode {
 
     this.variant =
       ast.variant instanceof TerminalNode
-        ? ast.variant.text
+        ? ast.variant.unparse()
         : new YulEqualAndColon(ast.variant, offsets[0]);
 
     metadata = updateMetadata(
diff --git a/src/slang-nodes/YulStackAssignmentStatement.ts b/src/slang-nodes/YulStackAssignmentStatement.ts
index 7719b2d8c..56a84104e 100644
--- a/src/slang-nodes/YulStackAssignmentStatement.ts
+++ b/src/slang-nodes/YulStackAssignmentStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
@@ -7,7 +7,7 @@ import { YulIdentifier } from './YulIdentifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
diff --git a/src/slang-nodes/YulStatement.ts b/src/slang-nodes/YulStatement.ts
index 3f44d45c9..050b438bb 100644
--- a/src/slang-nodes/YulStatement.ts
+++ b/src/slang-nodes/YulStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulBlock } from './YulBlock.js';
 import { YulFunctionDefinition } from './YulFunctionDefinition.js';
@@ -16,8 +16,8 @@ import { YulExpression } from './YulExpression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulStatement implements SlangNode {
   readonly kind = NonterminalKind.YulStatement;
diff --git a/src/slang-nodes/YulStatements.ts b/src/slang-nodes/YulStatements.ts
index 920ac73b3..6d26be9c9 100644
--- a/src/slang-nodes/YulStatements.ts
+++ b/src/slang-nodes/YulStatements.ts
@@ -1,5 +1,5 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
 import { printComments } from '../slang-printers/print-comments.js';
 import { printPreservingEmptyLines } from '../slang-printers/print-preserving-empty-lines.js';
@@ -8,8 +8,8 @@ import { YulStatement } from './YulStatement.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
@@ -52,10 +52,7 @@ export class YulStatements implements SlangNode {
             printPreservingEmptyLines(path, print, options),
             printComments(path)
           ],
-          {
-            firstSeparator: hardline,
-            grouped: false
-          }
+          { firstSeparator: hardline, grouped: false }
         );
   }
 }
diff --git a/src/slang-nodes/YulSwitchCase.ts b/src/slang-nodes/YulSwitchCase.ts
index 2d47fd6d1..3126140f5 100644
--- a/src/slang-nodes/YulSwitchCase.ts
+++ b/src/slang-nodes/YulSwitchCase.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulDefaultCase } from './YulDefaultCase.js';
 import { YulValueCase } from './YulValueCase.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulSwitchCase implements SlangNode {
   readonly kind = NonterminalKind.YulSwitchCase;
diff --git a/src/slang-nodes/YulSwitchCases.ts b/src/slang-nodes/YulSwitchCases.ts
index 7d98e0aa7..d943ac00a 100644
--- a/src/slang-nodes/YulSwitchCases.ts
+++ b/src/slang-nodes/YulSwitchCases.ts
@@ -1,12 +1,12 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulSwitchCase } from './YulSwitchCase.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline, join } = doc.builders;
 
diff --git a/src/slang-nodes/YulSwitchStatement.ts b/src/slang-nodes/YulSwitchStatement.ts
index ae95cf658..2770fcd30 100644
--- a/src/slang-nodes/YulSwitchStatement.ts
+++ b/src/slang-nodes/YulSwitchStatement.ts
@@ -1,13 +1,13 @@
 import { doc } from 'prettier';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulExpression } from './YulExpression.js';
 import { YulSwitchCases } from './YulSwitchCases.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
diff --git a/src/slang-nodes/YulValueCase.ts b/src/slang-nodes/YulValueCase.ts
index 9b5d58047..556a0004e 100644
--- a/src/slang-nodes/YulValueCase.ts
+++ b/src/slang-nodes/YulValueCase.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulLiteral } from './YulLiteral.js';
 import { YulBlock } from './YulBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulValueCase implements SlangNode {
   readonly kind = NonterminalKind.YulValueCase;
diff --git a/src/slang-nodes/YulVariableAssignmentStatement.ts b/src/slang-nodes/YulVariableAssignmentStatement.ts
index 767024bbb..f05ac00ff 100644
--- a/src/slang-nodes/YulVariableAssignmentStatement.ts
+++ b/src/slang-nodes/YulVariableAssignmentStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulPaths } from './YulPaths.js';
@@ -7,8 +7,8 @@ import { YulExpression } from './YulExpression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { join } = doc.builders;
 
diff --git a/src/slang-nodes/YulVariableDeclarationStatement.ts b/src/slang-nodes/YulVariableDeclarationStatement.ts
index cfee545f2..3db71105c 100644
--- a/src/slang-nodes/YulVariableDeclarationStatement.ts
+++ b/src/slang-nodes/YulVariableDeclarationStatement.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 import { YulVariableDeclarationValue } from './YulVariableDeclarationValue.js';
@@ -6,8 +6,8 @@ import { YulVariableNames } from './YulVariableNames.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulVariableDeclarationStatement implements SlangNode {
   readonly kind = NonterminalKind.YulVariableDeclarationStatement;
diff --git a/src/slang-nodes/YulVariableDeclarationValue.ts b/src/slang-nodes/YulVariableDeclarationValue.ts
index aef660882..6652a7118 100644
--- a/src/slang-nodes/YulVariableDeclarationValue.ts
+++ b/src/slang-nodes/YulVariableDeclarationValue.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { getNodeMetadata, updateMetadata } from '../slang-utils/metadata.js';
 import { YulAssignmentOperator } from './YulAssignmentOperator.js';
 import { YulExpression } from './YulExpression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { PrintFunction, SlangNode } from '../types';
+import type { AstNode } from './types.d.ts';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 export class YulVariableDeclarationValue implements SlangNode {
   readonly kind = NonterminalKind.YulVariableDeclarationValue;
diff --git a/src/slang-nodes/YulVariableNames.ts b/src/slang-nodes/YulVariableNames.ts
index 56a3119ff..1a9f9291d 100644
--- a/src/slang-nodes/YulVariableNames.ts
+++ b/src/slang-nodes/YulVariableNames.ts
@@ -1,4 +1,4 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { printSeparatedList } from '../slang-printers/print-separated-list.js';
 import { getNodeMetadata } from '../slang-utils/metadata.js';
@@ -6,7 +6,7 @@ import { YulIdentifier } from './YulIdentifier.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc } from 'prettier';
-import type { PrintFunction, SlangNode } from '../types';
+import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { line } = doc.builders;
 
@@ -28,7 +28,7 @@ export class YulVariableNames implements SlangNode {
     this.items = ast.items.map(
       (item, index) => new YulIdentifier(item, offsets[index])
     );
-    this.separators = ast.separators.map((separator) => separator.text);
+    this.separators = ast.separators.map((separator) => separator.unparse());
 
     this.comments = metadata.comments;
     this.loc = metadata.loc;
diff --git a/src/slang-nodes/index.d.ts b/src/slang-nodes/types.d.ts
similarity index 50%
rename from src/slang-nodes/index.d.ts
rename to src/slang-nodes/types.d.ts
index 991344b83..0e785273a 100644
--- a/src/slang-nodes/index.d.ts
+++ b/src/slang-nodes/types.d.ts
@@ -1,227 +1,227 @@
-import type { ABICoderPragma } from './ABICoderPragma';
-import type { AdditiveExpression } from './AdditiveExpression';
-import type { AddressType } from './AddressType';
-import type { AndExpression } from './AndExpression';
-import type { ArgumentsDeclaration } from './ArgumentsDeclaration';
-import type { ArrayExpression } from './ArrayExpression';
-import type { ArrayTypeName } from './ArrayTypeName';
-import type { ArrayValues } from './ArrayValues';
-import type { AssemblyFlags } from './AssemblyFlags';
-import type { AssemblyFlagsDeclaration } from './AssemblyFlagsDeclaration';
-import type { AssemblyStatement } from './AssemblyStatement';
-import type { AssignmentExpression } from './AssignmentExpression';
-import type { BitwiseAndExpression } from './BitwiseAndExpression';
-import type { BitwiseOrExpression } from './BitwiseOrExpression';
-import type { BitwiseXorExpression } from './BitwiseXorExpression';
-import type { Block } from './Block';
-import type { BreakStatement } from './BreakStatement';
-import type { CallOptions } from './CallOptions';
-import type { CallOptionsExpression } from './CallOptionsExpression';
-import type { CatchClause } from './CatchClause';
-import type { CatchClauseError } from './CatchClauseError';
-import type { CatchClauses } from './CatchClauses';
-import type { ComparisonExpression } from './ComparisonExpression';
-import type { ConditionalExpression } from './ConditionalExpression';
-import type { ConstantDefinition } from './ConstantDefinition';
-import type { ConstructorAttribute } from './ConstructorAttribute';
-import type { ConstructorAttributes } from './ConstructorAttributes';
-import type { ConstructorDefinition } from './ConstructorDefinition';
-import type { ContinueStatement } from './ContinueStatement';
-import type { ContractDefinition } from './ContractDefinition';
-import type { ContractMember } from './ContractMember';
-import type { ContractMembers } from './ContractMembers';
-import type { DecimalNumberExpression } from './DecimalNumberExpression';
-import type { DoWhileStatement } from './DoWhileStatement';
-import type { ElementaryType } from './ElementaryType';
-import type { ElseBranch } from './ElseBranch';
-import type { EmitStatement } from './EmitStatement';
-import type { EnumDefinition } from './EnumDefinition';
-import type { EnumMembers } from './EnumMembers';
-import type { EqualityExpression } from './EqualityExpression';
-import type { ErrorDefinition } from './ErrorDefinition';
-import type { ErrorParameter } from './ErrorParameter';
-import type { ErrorParameters } from './ErrorParameters';
-import type { ErrorParametersDeclaration } from './ErrorParametersDeclaration';
-import type { EventDefinition } from './EventDefinition';
-import type { EventParameter } from './EventParameter';
-import type { EventParameters } from './EventParameters';
-import type { EventParametersDeclaration } from './EventParametersDeclaration';
-import type { ExperimentalFeature } from './ExperimentalFeature';
-import type { ExperimentalPragma } from './ExperimentalPragma';
-import type { ExponentiationExpression } from './ExponentiationExpression';
-import type { Expression } from './Expression';
-import type { ExpressionStatement } from './ExpressionStatement';
-import type { FallbackFunctionAttribute } from './FallbackFunctionAttribute';
-import type { FallbackFunctionAttributes } from './FallbackFunctionAttributes';
-import type { FallbackFunctionDefinition } from './FallbackFunctionDefinition';
-import type { ForStatement } from './ForStatement';
-import type { ForStatementCondition } from './ForStatementCondition';
-import type { ForStatementInitialization } from './ForStatementInitialization';
-import type { FunctionAttribute } from './FunctionAttribute';
-import type { FunctionAttributes } from './FunctionAttributes';
-import type { FunctionBody } from './FunctionBody';
-import type { FunctionCallExpression } from './FunctionCallExpression';
-import type { FunctionDefinition } from './FunctionDefinition';
-import type { FunctionName } from './FunctionName';
-import type { FunctionType } from './FunctionType';
-import type { FunctionTypeAttribute } from './FunctionTypeAttribute';
-import type { FunctionTypeAttributes } from './FunctionTypeAttributes';
-import type { HexNumberExpression } from './HexNumberExpression';
-import type { HexStringLiteral } from './HexStringLiteral';
-import type { HexStringLiterals } from './HexStringLiterals';
-import type { Identifier } from './Identifier';
-import type { IdentifierPath } from './IdentifierPath';
-import type { IfStatement } from './IfStatement';
-import type { ImportAlias } from './ImportAlias';
-import type { ImportClause } from './ImportClause';
-import type { ImportDeconstruction } from './ImportDeconstruction';
-import type { ImportDeconstructionSymbol } from './ImportDeconstructionSymbol';
-import type { ImportDeconstructionSymbols } from './ImportDeconstructionSymbols';
-import type { ImportDirective } from './ImportDirective';
-import type { IndexAccessEnd } from './IndexAccessEnd';
-import type { IndexAccessExpression } from './IndexAccessExpression';
-import type { InheritanceSpecifier } from './InheritanceSpecifier';
-import type { InheritanceType } from './InheritanceType';
-import type { InheritanceTypes } from './InheritanceTypes';
-import type { InterfaceDefinition } from './InterfaceDefinition';
-import type { InterfaceMembers } from './InterfaceMembers';
-import type { LibraryDefinition } from './LibraryDefinition';
-import type { LibraryMembers } from './LibraryMembers';
-import type { MappingKey } from './MappingKey';
-import type { MappingKeyType } from './MappingKeyType';
-import type { MappingType } from './MappingType';
-import type { MappingValue } from './MappingValue';
-import type { MemberAccessExpression } from './MemberAccessExpression';
-import type { ModifierAttribute } from './ModifierAttribute';
-import type { ModifierAttributes } from './ModifierAttributes';
-import type { ModifierDefinition } from './ModifierDefinition';
-import type { ModifierInvocation } from './ModifierInvocation';
-import type { MultiLineComment } from './MultiLineComment';
-import type { MultiLineNatSpecComment } from './MultiLineNatSpecComment';
-import type { MultiplicativeExpression } from './MultiplicativeExpression';
-import type { NamedArgument } from './NamedArgument';
-import type { NamedArgumentGroup } from './NamedArgumentGroup';
-import type { NamedArguments } from './NamedArguments';
-import type { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration';
-import type { NamedImport } from './NamedImport';
-import type { NewExpression } from './NewExpression';
-import type { NumberUnit } from './NumberUnit';
-import type { OrExpression } from './OrExpression';
-import type { OverridePaths } from './OverridePaths';
-import type { OverridePathsDeclaration } from './OverridePathsDeclaration';
-import type { OverrideSpecifier } from './OverrideSpecifier';
-import type { Parameter } from './Parameter';
-import type { Parameters } from './Parameters';
-import type { ParametersDeclaration } from './ParametersDeclaration';
-import type { PathImport } from './PathImport';
-import type { PositionalArguments } from './PositionalArguments';
-import type { PositionalArgumentsDeclaration } from './PositionalArgumentsDeclaration';
-import type { PostfixExpression } from './PostfixExpression';
-import type { Pragma } from './Pragma';
-import type { PragmaDirective } from './PragmaDirective';
-import type { PrefixExpression } from './PrefixExpression';
-import type { ReceiveFunctionAttribute } from './ReceiveFunctionAttribute';
-import type { ReceiveFunctionAttributes } from './ReceiveFunctionAttributes';
-import type { ReceiveFunctionDefinition } from './ReceiveFunctionDefinition';
-import type { ReturnsDeclaration } from './ReturnsDeclaration';
-import type { ReturnStatement } from './ReturnStatement';
-import type { RevertStatement } from './RevertStatement';
-import type { ShiftExpression } from './ShiftExpression';
-import type { SimpleVersionLiteral } from './SimpleVersionLiteral';
-import type { SingleLineComment } from './SingleLineComment';
-import type { SingleLineNatSpecComment } from './SingleLineNatSpecComment';
-import type { SourceUnit } from './SourceUnit';
-import type { SourceUnitMember } from './SourceUnitMember';
-import type { SourceUnitMembers } from './SourceUnitMembers';
-import type { Statement } from './Statement';
-import type { Statements } from './Statements';
-import type { StateVariableAttribute } from './StateVariableAttribute';
-import type { StateVariableAttributes } from './StateVariableAttributes';
-import type { StateVariableDefinition } from './StateVariableDefinition';
-import type { StateVariableDefinitionValue } from './StateVariableDefinitionValue';
-import type { StorageLocation } from './StorageLocation';
-import type { StringExpression } from './StringExpression';
-import type { StringLiteral } from './StringLiteral';
-import type { StringLiterals } from './StringLiterals';
-import type { StructDefinition } from './StructDefinition';
-import type { StructMember } from './StructMember';
-import type { StructMembers } from './StructMembers';
-import type { ThrowStatement } from './ThrowStatement';
-import type { TryStatement } from './TryStatement';
-import type { TupleDeconstructionElement } from './TupleDeconstructionElement';
-import type { TupleDeconstructionElements } from './TupleDeconstructionElements';
-import type { TupleDeconstructionStatement } from './TupleDeconstructionStatement';
-import type { TupleExpression } from './TupleExpression';
-import type { TupleMember } from './TupleMember';
-import type { TupleValue } from './TupleValue';
-import type { TupleValues } from './TupleValues';
-import type { TypedTupleMember } from './TypedTupleMember';
-import type { TypeExpression } from './TypeExpression';
-import type { TypeName } from './TypeName';
-import type { UncheckedBlock } from './UncheckedBlock';
-import type { UnicodeStringLiteral } from './UnicodeStringLiteral';
-import type { UnicodeStringLiterals } from './UnicodeStringLiterals';
-import type { UnnamedFunctionAttribute } from './UnnamedFunctionAttribute';
-import type { UnnamedFunctionAttributes } from './UnnamedFunctionAttributes';
-import type { UnnamedFunctionDefinition } from './UnnamedFunctionDefinition';
-import type { UntypedTupleMember } from './UntypedTupleMember';
-import type { UserDefinedValueTypeDefinition } from './UserDefinedValueTypeDefinition';
-import type { UsingAlias } from './UsingAlias';
-import type { UsingClause } from './UsingClause';
-import type { UsingDeconstruction } from './UsingDeconstruction';
-import type { UsingDeconstructionSymbol } from './UsingDeconstructionSymbol';
-import type { UsingDeconstructionSymbols } from './UsingDeconstructionSymbols';
-import type { UsingDirective } from './UsingDirective';
-import type { UsingOperator } from './UsingOperator';
-import type { UsingTarget } from './UsingTarget';
-import type { VariableDeclarationStatement } from './VariableDeclarationStatement';
-import type { VariableDeclarationType } from './VariableDeclarationType';
-import type { VariableDeclarationValue } from './VariableDeclarationValue';
-import type { VersionExpression } from './VersionExpression';
-import type { VersionExpressionSet } from './VersionExpressionSet';
-import type { VersionExpressionSets } from './VersionExpressionSets';
-import type { VersionOperator } from './VersionOperator';
-import type { VersionLiteral } from './VersionLiteral';
-import type { VersionPragma } from './VersionPragma';
-import type { VersionRange } from './VersionRange';
-import type { VersionTerm } from './VersionTerm';
-import type { WhileStatement } from './WhileStatement';
-import type { YulArguments } from './YulArguments';
-import type { YulAssignmentOperator } from './YulAssignmentOperator';
-import type { YulBlock } from './YulBlock';
-import type { YulBreakStatement } from './YulBreakStatement';
-import type { YulBuiltInFunction } from './YulBuiltInFunction';
-import type { YulColonAndEqual } from './YulColonAndEqual';
-import type { YulContinueStatement } from './YulContinueStatement';
-import type { YulDefaultCase } from './YulDefaultCase';
-import type { YulEqualAndColon } from './YulEqualAndColon';
-import type { YulExpression } from './YulExpression';
-import type { YulForStatement } from './YulForStatement';
-import type { YulFunctionCallExpression } from './YulFunctionCallExpression';
-import type { YulFunctionDefinition } from './YulFunctionDefinition';
-import type { YulIdentifier } from './YulIdentifier';
-import type { YulIfStatement } from './YulIfStatement';
-import type { YulLabel } from './YulLabel';
-import type { YulLeaveStatement } from './YulLeaveStatement';
-import type { YulLiteral } from './YulLiteral';
-import type { YulParameters } from './YulParameters';
-import type { YulParametersDeclaration } from './YulParametersDeclaration';
-import type { YulPath } from './YulPath';
-import type { YulPathComponent } from './YulPathComponent';
-import type { YulPaths } from './YulPaths';
-import type { YulReturnsDeclaration } from './YulReturnsDeclaration';
-import type { YulStackAssignmentOperator } from './YulStackAssignmentOperator';
-import type { YulStackAssignmentStatement } from './YulStackAssignmentStatement';
-import type { YulStatement } from './YulStatement';
-import type { YulStatements } from './YulStatements';
-import type { YulSwitchCase } from './YulSwitchCase';
-import type { YulSwitchCases } from './YulSwitchCases';
-import type { YulSwitchStatement } from './YulSwitchStatement';
-import type { YulValueCase } from './YulValueCase';
-import type { YulVariableAssignmentStatement } from './YulVariableAssignmentStatement';
-import type { YulVariableDeclarationStatement } from './YulVariableDeclarationStatement';
-import type { YulVariableDeclarationValue } from './YulVariableDeclarationValue';
-import type { YulVariableNames } from './YulVariableNames';
+import type { AbicoderPragma } from './AbicoderPragma.ts';
+import type { AdditiveExpression } from './AdditiveExpression.ts';
+import type { AddressType } from './AddressType.ts';
+import type { AndExpression } from './AndExpression.ts';
+import type { ArgumentsDeclaration } from './ArgumentsDeclaration.ts';
+import type { ArrayExpression } from './ArrayExpression.ts';
+import type { ArrayTypeName } from './ArrayTypeName.ts';
+import type { ArrayValues } from './ArrayValues.ts';
+import type { AssemblyFlags } from './AssemblyFlags.ts';
+import type { AssemblyFlagsDeclaration } from './AssemblyFlagsDeclaration.ts';
+import type { AssemblyStatement } from './AssemblyStatement.ts';
+import type { AssignmentExpression } from './AssignmentExpression.ts';
+import type { BitwiseAndExpression } from './BitwiseAndExpression.ts';
+import type { BitwiseOrExpression } from './BitwiseOrExpression.ts';
+import type { BitwiseXorExpression } from './BitwiseXorExpression.ts';
+import type { Block } from './Block.ts';
+import type { BreakStatement } from './BreakStatement.ts';
+import type { CallOptions } from './CallOptions.ts';
+import type { CallOptionsExpression } from './CallOptionsExpression.ts';
+import type { CatchClause } from './CatchClause.ts';
+import type { CatchClauseError } from './CatchClauseError.ts';
+import type { CatchClauses } from './CatchClauses.ts';
+import type { ComparisonExpression } from './ComparisonExpression.ts';
+import type { ConditionalExpression } from './ConditionalExpression.ts';
+import type { ConstantDefinition } from './ConstantDefinition.ts';
+import type { ConstructorAttribute } from './ConstructorAttribute.ts';
+import type { ConstructorAttributes } from './ConstructorAttributes.ts';
+import type { ConstructorDefinition } from './ConstructorDefinition.ts';
+import type { ContinueStatement } from './ContinueStatement.ts';
+import type { ContractDefinition } from './ContractDefinition.ts';
+import type { ContractMember } from './ContractMember.ts';
+import type { ContractMembers } from './ContractMembers.ts';
+import type { DecimalNumberExpression } from './DecimalNumberExpression.ts';
+import type { DoWhileStatement } from './DoWhileStatement.ts';
+import type { ElementaryType } from './ElementaryType.ts';
+import type { ElseBranch } from './ElseBranch.ts';
+import type { EmitStatement } from './EmitStatement.ts';
+import type { EnumDefinition } from './EnumDefinition.ts';
+import type { EnumMembers } from './EnumMembers.ts';
+import type { EqualityExpression } from './EqualityExpression.ts';
+import type { ErrorDefinition } from './ErrorDefinition.ts';
+import type { ErrorParameter } from './ErrorParameter.ts';
+import type { ErrorParameters } from './ErrorParameters.ts';
+import type { ErrorParametersDeclaration } from './ErrorParametersDeclaration.ts';
+import type { EventDefinition } from './EventDefinition.ts';
+import type { EventParameter } from './EventParameter.ts';
+import type { EventParameters } from './EventParameters.ts';
+import type { EventParametersDeclaration } from './EventParametersDeclaration.ts';
+import type { ExperimentalFeature } from './ExperimentalFeature.ts';
+import type { ExperimentalPragma } from './ExperimentalPragma.ts';
+import type { ExponentiationExpression } from './ExponentiationExpression.ts';
+import type { Expression } from './Expression.ts';
+import type { ExpressionStatement } from './ExpressionStatement.ts';
+import type { FallbackFunctionAttribute } from './FallbackFunctionAttribute.ts';
+import type { FallbackFunctionAttributes } from './FallbackFunctionAttributes.ts';
+import type { FallbackFunctionDefinition } from './FallbackFunctionDefinition.ts';
+import type { ForStatement } from './ForStatement.ts';
+import type { ForStatementCondition } from './ForStatementCondition.ts';
+import type { ForStatementInitialization } from './ForStatementInitialization.ts';
+import type { FunctionAttribute } from './FunctionAttribute.ts';
+import type { FunctionAttributes } from './FunctionAttributes.ts';
+import type { FunctionBody } from './FunctionBody.ts';
+import type { FunctionCallExpression } from './FunctionCallExpression.ts';
+import type { FunctionDefinition } from './FunctionDefinition.ts';
+import type { FunctionName } from './FunctionName.ts';
+import type { FunctionType } from './FunctionType.ts';
+import type { FunctionTypeAttribute } from './FunctionTypeAttribute.ts';
+import type { FunctionTypeAttributes } from './FunctionTypeAttributes.ts';
+import type { HexNumberExpression } from './HexNumberExpression.ts';
+import type { HexStringLiteral } from './HexStringLiteral.ts';
+import type { HexStringLiterals } from './HexStringLiterals.ts';
+import type { Identifier } from './Identifier.ts';
+import type { IdentifierPath } from './IdentifierPath.ts';
+import type { IfStatement } from './IfStatement.ts';
+import type { ImportAlias } from './ImportAlias.ts';
+import type { ImportClause } from './ImportClause.ts';
+import type { ImportDeconstruction } from './ImportDeconstruction.ts';
+import type { ImportDeconstructionSymbol } from './ImportDeconstructionSymbol.ts';
+import type { ImportDeconstructionSymbols } from './ImportDeconstructionSymbols.ts';
+import type { ImportDirective } from './ImportDirective.ts';
+import type { IndexAccessEnd } from './IndexAccessEnd.ts';
+import type { IndexAccessExpression } from './IndexAccessExpression.ts';
+import type { InheritanceSpecifier } from './InheritanceSpecifier.ts';
+import type { InheritanceType } from './InheritanceType.ts';
+import type { InheritanceTypes } from './InheritanceTypes.ts';
+import type { InterfaceDefinition } from './InterfaceDefinition.ts';
+import type { InterfaceMembers } from './InterfaceMembers.ts';
+import type { LibraryDefinition } from './LibraryDefinition.ts';
+import type { LibraryMembers } from './LibraryMembers.ts';
+import type { MappingKey } from './MappingKey.ts';
+import type { MappingKeyType } from './MappingKeyType.ts';
+import type { MappingType } from './MappingType.ts';
+import type { MappingValue } from './MappingValue.ts';
+import type { MemberAccessExpression } from './MemberAccessExpression.ts';
+import type { ModifierAttribute } from './ModifierAttribute.ts';
+import type { ModifierAttributes } from './ModifierAttributes.ts';
+import type { ModifierDefinition } from './ModifierDefinition.ts';
+import type { ModifierInvocation } from './ModifierInvocation.ts';
+import type { MultiLineComment } from './MultiLineComment.ts';
+import type { MultiLineNatSpecComment } from './MultiLineNatSpecComment.ts';
+import type { MultiplicativeExpression } from './MultiplicativeExpression.ts';
+import type { NamedArgument } from './NamedArgument.ts';
+import type { NamedArgumentGroup } from './NamedArgumentGroup.ts';
+import type { NamedArguments } from './NamedArguments.ts';
+import type { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration.ts';
+import type { NamedImport } from './NamedImport.ts';
+import type { NewExpression } from './NewExpression.ts';
+import type { NumberUnit } from './NumberUnit.ts';
+import type { OrExpression } from './OrExpression.ts';
+import type { OverridePaths } from './OverridePaths.ts';
+import type { OverridePathsDeclaration } from './OverridePathsDeclaration.ts';
+import type { OverrideSpecifier } from './OverrideSpecifier.ts';
+import type { Parameter } from './Parameter.ts';
+import type { Parameters } from './Parameters.ts';
+import type { ParametersDeclaration } from './ParametersDeclaration.ts';
+import type { PathImport } from './PathImport.ts';
+import type { PositionalArguments } from './PositionalArguments.ts';
+import type { PositionalArgumentsDeclaration } from './PositionalArgumentsDeclaration.ts';
+import type { PostfixExpression } from './PostfixExpression.ts';
+import type { Pragma } from './Pragma.ts';
+import type { PragmaDirective } from './PragmaDirective.ts';
+import type { PrefixExpression } from './PrefixExpression.ts';
+import type { ReceiveFunctionAttribute } from './ReceiveFunctionAttribute.ts';
+import type { ReceiveFunctionAttributes } from './ReceiveFunctionAttributes.ts';
+import type { ReceiveFunctionDefinition } from './ReceiveFunctionDefinition.ts';
+import type { ReturnsDeclaration } from './ReturnsDeclaration.ts';
+import type { ReturnStatement } from './ReturnStatement.ts';
+import type { RevertStatement } from './RevertStatement.ts';
+import type { ShiftExpression } from './ShiftExpression.ts';
+import type { SimpleVersionLiteral } from './SimpleVersionLiteral.ts';
+import type { SingleLineComment } from './SingleLineComment.ts';
+import type { SingleLineNatSpecComment } from './SingleLineNatSpecComment.ts';
+import type { SourceUnit } from './SourceUnit.ts';
+import type { SourceUnitMember } from './SourceUnitMember.ts';
+import type { SourceUnitMembers } from './SourceUnitMembers.ts';
+import type { Statement } from './Statement.ts';
+import type { Statements } from './Statements.ts';
+import type { StateVariableAttribute } from './StateVariableAttribute.ts';
+import type { StateVariableAttributes } from './StateVariableAttributes.ts';
+import type { StateVariableDefinition } from './StateVariableDefinition.ts';
+import type { StateVariableDefinitionValue } from './StateVariableDefinitionValue.ts';
+import type { StorageLocation } from './StorageLocation.ts';
+import type { StringExpression } from './StringExpression.ts';
+import type { StringLiteral } from './StringLiteral.ts';
+import type { StringLiterals } from './StringLiterals.ts';
+import type { StructDefinition } from './StructDefinition.ts';
+import type { StructMember } from './StructMember.ts';
+import type { StructMembers } from './StructMembers.ts';
+import type { ThrowStatement } from './ThrowStatement.ts';
+import type { TryStatement } from './TryStatement.ts';
+import type { TupleDeconstructionElement } from './TupleDeconstructionElement.ts';
+import type { TupleDeconstructionElements } from './TupleDeconstructionElements.ts';
+import type { TupleDeconstructionStatement } from './TupleDeconstructionStatement.ts';
+import type { TupleExpression } from './TupleExpression.ts';
+import type { TupleMember } from './TupleMember.ts';
+import type { TupleValue } from './TupleValue.ts';
+import type { TupleValues } from './TupleValues.ts';
+import type { TypedTupleMember } from './TypedTupleMember.ts';
+import type { TypeExpression } from './TypeExpression.ts';
+import type { TypeName } from './TypeName.ts';
+import type { UncheckedBlock } from './UncheckedBlock.ts';
+import type { UnicodeStringLiteral } from './UnicodeStringLiteral.ts';
+import type { UnicodeStringLiterals } from './UnicodeStringLiterals.ts';
+import type { UnnamedFunctionAttribute } from './UnnamedFunctionAttribute.ts';
+import type { UnnamedFunctionAttributes } from './UnnamedFunctionAttributes.ts';
+import type { UnnamedFunctionDefinition } from './UnnamedFunctionDefinition.ts';
+import type { UntypedTupleMember } from './UntypedTupleMember.ts';
+import type { UserDefinedValueTypeDefinition } from './UserDefinedValueTypeDefinition.ts';
+import type { UsingAlias } from './UsingAlias.ts';
+import type { UsingClause } from './UsingClause.ts';
+import type { UsingDeconstruction } from './UsingDeconstruction.ts';
+import type { UsingDeconstructionSymbol } from './UsingDeconstructionSymbol.ts';
+import type { UsingDeconstructionSymbols } from './UsingDeconstructionSymbols.ts';
+import type { UsingDirective } from './UsingDirective.ts';
+import type { UsingOperator } from './UsingOperator.ts';
+import type { UsingTarget } from './UsingTarget.ts';
+import type { VariableDeclarationStatement } from './VariableDeclarationStatement.ts';
+import type { VariableDeclarationType } from './VariableDeclarationType.ts';
+import type { VariableDeclarationValue } from './VariableDeclarationValue.ts';
+import type { VersionExpression } from './VersionExpression.ts';
+import type { VersionExpressionSet } from './VersionExpressionSet.ts';
+import type { VersionExpressionSets } from './VersionExpressionSets.ts';
+import type { VersionOperator } from './VersionOperator.ts';
+import type { VersionLiteral } from './VersionLiteral.ts';
+import type { VersionPragma } from './VersionPragma.ts';
+import type { VersionRange } from './VersionRange.ts';
+import type { VersionTerm } from './VersionTerm.ts';
+import type { WhileStatement } from './WhileStatement.ts';
+import type { YulArguments } from './YulArguments.ts';
+import type { YulAssignmentOperator } from './YulAssignmentOperator.ts';
+import type { YulBlock } from './YulBlock.ts';
+import type { YulBreakStatement } from './YulBreakStatement.ts';
+import type { YulBuiltInFunction } from './YulBuiltInFunction.ts';
+import type { YulColonAndEqual } from './YulColonAndEqual.ts';
+import type { YulContinueStatement } from './YulContinueStatement.ts';
+import type { YulDefaultCase } from './YulDefaultCase.ts';
+import type { YulEqualAndColon } from './YulEqualAndColon.ts';
+import type { YulExpression } from './YulExpression.ts';
+import type { YulForStatement } from './YulForStatement.ts';
+import type { YulFunctionCallExpression } from './YulFunctionCallExpression.ts';
+import type { YulFunctionDefinition } from './YulFunctionDefinition.ts';
+import type { YulIdentifier } from './YulIdentifier.ts';
+import type { YulIfStatement } from './YulIfStatement.ts';
+import type { YulLabel } from './YulLabel.ts';
+import type { YulLeaveStatement } from './YulLeaveStatement.ts';
+import type { YulLiteral } from './YulLiteral.ts';
+import type { YulParameters } from './YulParameters.ts';
+import type { YulParametersDeclaration } from './YulParametersDeclaration.ts';
+import type { YulPath } from './YulPath.ts';
+import type { YulPathComponent } from './YulPathComponent.ts';
+import type { YulPaths } from './YulPaths.ts';
+import type { YulReturnsDeclaration } from './YulReturnsDeclaration.ts';
+import type { YulStackAssignmentOperator } from './YulStackAssignmentOperator.ts';
+import type { YulStackAssignmentStatement } from './YulStackAssignmentStatement.ts';
+import type { YulStatement } from './YulStatement.ts';
+import type { YulStatements } from './YulStatements.ts';
+import type { YulSwitchCase } from './YulSwitchCase.ts';
+import type { YulSwitchCases } from './YulSwitchCases.ts';
+import type { YulSwitchStatement } from './YulSwitchStatement.ts';
+import type { YulValueCase } from './YulValueCase.ts';
+import type { YulVariableAssignmentStatement } from './YulVariableAssignmentStatement.ts';
+import type { YulVariableDeclarationStatement } from './YulVariableDeclarationStatement.ts';
+import type { YulVariableDeclarationValue } from './YulVariableDeclarationValue.ts';
+import type { YulVariableNames } from './YulVariableNames.ts';
 
 export type FunctionLike =
   | ConstructorDefinition
@@ -241,7 +241,7 @@ export type Comment = BlockComment | LineComment;
 export type StrictAstNode =
   | SourceUnit
   | PragmaDirective
-  | ABICoderPragma
+  | AbicoderPragma
   | ExperimentalPragma
   | VersionPragma
   | VersionRange
diff --git a/src/slang-printers/create-binary-operation-printer.ts b/src/slang-printers/create-binary-operation-printer.ts
index f6212e7dc..2d327acaa 100644
--- a/src/slang-printers/create-binary-operation-printer.ts
+++ b/src/slang-printers/create-binary-operation-printer.ts
@@ -1,10 +1,14 @@
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, BinaryOperation, StrictAstNode } from '../slang-nodes';
-import type { PrintFunction } from '../types';
+import type {
+  AstNode,
+  BinaryOperation,
+  StrictAstNode
+} from '../slang-nodes/types.d.ts';
+import type { PrintFunction } from '../types.d.ts';
 
 const { group, line } = doc.builders;
 
diff --git a/src/slang-printers/print-binary-operation.ts b/src/slang-printers/print-binary-operation.ts
index 7da596484..6bac5c5ce 100644
--- a/src/slang-printers/print-binary-operation.ts
+++ b/src/slang-printers/print-binary-operation.ts
@@ -1,12 +1,12 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { createBinaryOperationPrinter } from './create-binary-operation-printer.js';
 import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js';
 
 import type { AstPath, Doc } from 'prettier';
-import type { BinaryOperation, StrictAstNode } from '../slang-nodes';
-import type { ComparisonExpression } from '../slang-nodes/ComparisonExpression';
-import type { EqualityExpression } from '../slang-nodes/EqualityExpression';
+import type { BinaryOperation, StrictAstNode } from '../slang-nodes/types.d.ts';
+import type { ComparisonExpression } from '../slang-nodes/ComparisonExpression.ts';
+import type { EqualityExpression } from '../slang-nodes/EqualityExpression.ts';
 
 const { group, indent } = doc.builders;
 
diff --git a/src/slang-printers/print-comments.ts b/src/slang-printers/print-comments.ts
index 7c292bea0..cabfb7b78 100644
--- a/src/slang-printers/print-comments.ts
+++ b/src/slang-printers/print-comments.ts
@@ -1,12 +1,10 @@
 import { doc } from 'prettier';
 import { printComment } from '../slang-comments/printer.js';
-import { isPrettier2 } from '../slang-utils/backward-compatibility.js';
 import { isBlockComment } from '../slang-utils/is-comment.js';
 import { joinExisting } from '../slang-utils/join-existing.js';
 
 import type { AstPath, Doc } from 'prettier';
-import type { AstNode } from '../slang-nodes';
-import type { DocV2 } from './types';
+import type { AstNode } from '../slang-nodes/types.d.ts';
 
 const { breakParent, line } = doc.builders;
 
@@ -24,12 +22,5 @@ export function printComments(path: AstPath<AstNode>): Doc[] {
     }, 'comments')
   );
 
-  // The following if statement will never be 100% covered in a single run
-  // since it depends on the version of Prettier being used.
-  // Mocking the behaviour will introduce a lot of maintenance in the tests.
-  /* c8 ignore start */
-  return isPrettier2
-    ? (document as DocV2).parts // Prettier V2
-    : document; // Prettier V3
-  /* c8 ignore stop */
+  return document;
 }
diff --git a/src/slang-printers/print-comparison-operation.ts b/src/slang-printers/print-comparison-operation.ts
index c25182434..6db056370 100644
--- a/src/slang-printers/print-comparison-operation.ts
+++ b/src/slang-printers/print-comparison-operation.ts
@@ -1,11 +1,11 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 import { createBinaryOperationPrinter } from './create-binary-operation-printer.js';
 
 import type { AstPath, Doc } from 'prettier';
-import type { BinaryOperation, StrictAstNode } from '../slang-nodes';
+import type { BinaryOperation, StrictAstNode } from '../slang-nodes/types.d.ts';
 
 const { group, indent } = doc.builders;
 
diff --git a/src/slang-printers/print-function.ts b/src/slang-printers/print-function.ts
index dcfed2324..e95ea50f4 100644
--- a/src/slang-printers/print-function.ts
+++ b/src/slang-printers/print-function.ts
@@ -2,9 +2,9 @@ import { doc } from 'prettier';
 import { joinExisting } from '../slang-utils/join-existing.js';
 
 import type { AstPath, Doc } from 'prettier';
-import type { FunctionLike } from '../slang-nodes';
-import type { PrintFunction } from '../types';
-import type { FunctionDefinition } from '../slang-nodes/FunctionDefinition';
+import type { FunctionLike } from '../slang-nodes/types.d.ts';
+import type { PrintFunction } from '../types.d.ts';
+import type { FunctionDefinition } from '../slang-nodes/FunctionDefinition.ts';
 
 const { dedent, group, indent, line } = doc.builders;
 
diff --git a/src/slang-printers/print-indentable-block-comment.ts b/src/slang-printers/print-indentable-block-comment.ts
index 52eb258d2..cc5598eec 100644
--- a/src/slang-printers/print-indentable-block-comment.ts
+++ b/src/slang-printers/print-indentable-block-comment.ts
@@ -1,7 +1,7 @@
 import { doc } from 'prettier';
 
 import type { Doc } from 'prettier';
-import type { BlockComment } from '../slang-nodes';
+import type { BlockComment } from '../slang-nodes/types.d.ts';
 
 const { hardline, join } = doc.builders;
 
diff --git a/src/slang-printers/print-logical-operation.ts b/src/slang-printers/print-logical-operation.ts
index 6207f2d38..d0b8b7547 100644
--- a/src/slang-printers/print-logical-operation.ts
+++ b/src/slang-printers/print-logical-operation.ts
@@ -1,11 +1,15 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { createKindCheckFunction } from '../slang-utils/create-kind-check-function.js';
 import { isBinaryOperation } from '../slang-utils/is-binary-operation.js';
 import { createBinaryOperationPrinter } from './create-binary-operation-printer.js';
 
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, BinaryOperation, StrictAstNode } from '../slang-nodes';
+import type {
+  AstNode,
+  BinaryOperation,
+  StrictAstNode
+} from '../slang-nodes/types.d.ts';
 
 const { group, indent } = doc.builders;
 
diff --git a/src/slang-printers/print-preserving-empty-lines.ts b/src/slang-printers/print-preserving-empty-lines.ts
index ddc6d28b1..fa0f77d96 100644
--- a/src/slang-printers/print-preserving-empty-lines.ts
+++ b/src/slang-printers/print-preserving-empty-lines.ts
@@ -1,14 +1,14 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { doc } from 'prettier';
-import {
-  isLast,
-  isNextLineEmpty
-} from '../slang-utils/backward-compatibility.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
+import { doc, util } from 'prettier';
 import { locEnd } from '../slang-utils/loc.js';
 
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, CollectionNode, StrictAstNode } from '../slang-nodes';
-import type { PrintFunction } from '../types';
+import type {
+  AstNode,
+  CollectionNode,
+  StrictAstNode
+} from '../slang-nodes/types.d.ts';
+import type { PrintFunction } from '../types.d.ts';
 
 const { hardline } = doc.builders;
 
@@ -17,12 +17,12 @@ export function printPreservingEmptyLines(
   print: PrintFunction,
   options: ParserOptions<AstNode>
 ): Doc {
-  return path.map((childPath, index) => {
+  return path.map((childPath) => {
     const node = childPath.getNode() as StrictAstNode;
 
     return [
       // Only attempt to prepend an empty line if `node` is not the first item
-      index > 0 &&
+      !childPath.isFirst &&
       // YulLabel adds a dedented line so we don't have to prepend a hardline.
       (node.kind !== NonterminalKind.YulStatement ||
         node.variant.kind !== NonterminalKind.YulLabel)
@@ -30,10 +30,10 @@ export function printPreservingEmptyLines(
         : '',
       print(childPath),
       // Only attempt to append an empty line if `node` is not the last item
-      !isLast(childPath, index) &&
+      !childPath.isLast &&
       // Append an empty line if the original text already had an one after the
       // current `node`
-      isNextLineEmpty(options.originalText, locEnd(node))
+      util.isNextLineEmpty(options.originalText, locEnd(node))
         ? hardline
         : ''
     ];
diff --git a/src/slang-printers/print-separated-item.ts b/src/slang-printers/print-separated-item.ts
index 168554bfb..873c079d6 100644
--- a/src/slang-printers/print-separated-item.ts
+++ b/src/slang-printers/print-separated-item.ts
@@ -1,7 +1,7 @@
 import { doc } from 'prettier';
 
 import type { Doc } from 'prettier';
-import type { PrintSeparatedOptions } from './types';
+import type { PrintSeparatedOptions } from './types.d.ts';
 
 const { group, indent, softline } = doc.builders;
 
diff --git a/src/slang-printers/print-separated-list.ts b/src/slang-printers/print-separated-list.ts
index ff5e3fb90..6cc472aa8 100644
--- a/src/slang-printers/print-separated-list.ts
+++ b/src/slang-printers/print-separated-list.ts
@@ -2,7 +2,7 @@ import { doc } from 'prettier';
 import { printSeparatedItem } from './print-separated-item.js';
 
 import type { Doc } from 'prettier';
-import type { PrintSeparatedOptions } from './types';
+import type { PrintSeparatedOptions } from './types.d.ts';
 
 const { join, line } = doc.builders;
 
diff --git a/src/slang-printers/print-string.ts b/src/slang-printers/print-string.ts
index beef30a12..d05110899 100644
--- a/src/slang-printers/print-string.ts
+++ b/src/slang-printers/print-string.ts
@@ -1,7 +1,7 @@
 import { util } from 'prettier';
 
 import type { ParserOptions } from 'prettier';
-import type { AstNode } from '../slang-nodes';
+import type { AstNode } from '../slang-nodes/types.d.ts';
 
 const SINGLE_QUOTE: util.Quote = "'";
 const DOUBLE_QUOTE: util.Quote = '"';
diff --git a/src/slang-printers/types.d.ts b/src/slang-printers/types.d.ts
index 65ef7ee4f..cd254731f 100644
--- a/src/slang-printers/types.d.ts
+++ b/src/slang-printers/types.d.ts
@@ -6,5 +6,3 @@ interface PrintSeparatedOptions {
   lastSeparator?: Doc;
   grouped?: boolean;
 }
-
-type DocV2 = Doc[] & { parts: Doc[] };
diff --git a/src/slang-utils/backward-compatibility.ts b/src/slang-utils/backward-compatibility.ts
deleted file mode 100644
index 0bc5c7f0f..000000000
--- a/src/slang-utils/backward-compatibility.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { util } from 'prettier';
-import { prettierVersionSatisfies } from './prettier-version-satisfies.js';
-import { locEnd } from './loc.js';
-
-import type { AstPath } from 'prettier';
-import type { utilV2 } from './types';
-import type { AstNode, CollectionNode } from '../slang-nodes';
-
-export const isPrettier2 = prettierVersionSatisfies('^2.3.0');
-
-// The functions in this file will never be 100% covered in a single run
-// since it depends on the version of Prettier being used.
-// Mocking the behaviour will introduce a lot of maintenance in the tests.
-
-export function isNextLineEmpty(text: string, startIndex: number): boolean {
-  return isPrettier2
-    ? (util as utilV2).isNextLineEmptyAfterIndex(text, startIndex)
-    : util.isNextLineEmpty(text, startIndex); // V3 deprecated `isNextLineEmptyAfterIndex`
-}
-
-export function getNextNonSpaceNonCommentCharacter(
-  text: string,
-  node: AstNode
-): string {
-  if (isPrettier2) {
-    const index = (util as utilV2).getNextNonSpaceNonCommentCharacterIndex(
-      text,
-      node,
-      locEnd
-    );
-    return index === false ? '' : text.charAt(index);
-  }
-  return util.getNextNonSpaceNonCommentCharacter(text, locEnd(node)); // V3 exposes this function directly
-}
-
-export function isLast(path: AstPath<AstNode>, index: number): boolean {
-  return isPrettier2
-    ? index === (path.getParentNode() as CollectionNode).items.length - 1
-    : path.isLast;
-}
diff --git a/src/slang-utils/create-hug-function.ts b/src/slang-utils/create-hug-function.ts
index ad601cee2..866b092d1 100644
--- a/src/slang-utils/create-hug-function.ts
+++ b/src/slang-utils/create-hug-function.ts
@@ -1,7 +1,4 @@
-import {
-  NonterminalKind,
-  TerminalKind
-} from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst';
 import { isBinaryOperation } from './is-binary-operation.js';
 import { Expression } from '../slang-nodes/Expression.js';
 import { TupleExpression } from '../slang-nodes/TupleExpression.js';
diff --git a/src/slang-utils/create-kind-check-function.ts b/src/slang-utils/create-kind-check-function.ts
index 221fd981f..4a9440b0e 100644
--- a/src/slang-utils/create-kind-check-function.ts
+++ b/src/slang-utils/create-kind-check-function.ts
@@ -1,9 +1,9 @@
-import type { Node } from '@nomicfoundation/slang/cst';
 import type {
+  Node,
   NonterminalKind,
   TerminalKind
-} from '@nomicfoundation/slang/kinds';
-import type { StrictAstNode } from '../slang-nodes';
+} from '@nomicfoundation/slang/cst';
+import type { StrictAstNode } from '../slang-nodes/types.d.ts';
 
 export function createKindCheckFunction(
   kindsArray: (keyof typeof TerminalKind | keyof typeof NonterminalKind)[]
diff --git a/src/slang-utils/create-parser.ts b/src/slang-utils/create-parser.ts
new file mode 100644
index 000000000..6adbf0676
--- /dev/null
+++ b/src/slang-utils/create-parser.ts
@@ -0,0 +1,90 @@
+import { NonterminalKind, Query } from '@nomicfoundation/slang/cst';
+import { Parser } from '@nomicfoundation/slang/parser';
+import strip from 'strip-comments';
+import {
+  maxSatisfying,
+  minSatisfying,
+  minor,
+  major,
+  satisfies,
+  validRange
+} from 'semver';
+
+const supportedVersions = Parser.supportedVersions();
+
+const milestoneVersions = Array.from(
+  supportedVersions.reduce((minorRanges, version) => {
+    minorRanges.add(`^${major(version)}.${minor(version)}.0`);
+    return minorRanges;
+  }, new Set<string>())
+)
+  .reverse()
+  .reduce((versions: string[], range) => {
+    versions.push(maxSatisfying(supportedVersions, range)!);
+    versions.push(minSatisfying(supportedVersions, range)!);
+    return versions;
+  }, []);
+
+// TODO if we ended up selecting the same version that the pragmas were parsed with,
+// should we be able to reuse/just return the already parsed CST, instead of
+// returning a Parser and forcing user to parse it again?
+export function createParser(text: string): Parser {
+  let inferredRanges: string[] = [];
+
+  for (const version of milestoneVersions) {
+    try {
+      inferredRanges = tryToCollectPragmas(text, version);
+      break;
+    } catch {}
+  }
+
+  const satisfyingVersions = inferredRanges.reduce(
+    (versions, inferredRange) => {
+      if (!validRange(inferredRange)) {
+        throw new Error(
+          "Couldn't infer any version from the ranges in the pragmas."
+        );
+      }
+      return versions.filter((supportedVersion) =>
+        satisfies(supportedVersion, inferredRange)
+      );
+    },
+    supportedVersions
+  );
+
+  return satisfyingVersions.length > 0
+    ? Parser.create(satisfyingVersions[satisfyingVersions.length - 1])
+    : Parser.create(supportedVersions[supportedVersions.length - 1]);
+}
+
+function tryToCollectPragmas(text: string, version: string): string[] {
+  const language = Parser.create(version);
+  const parseOutput = language.parse(NonterminalKind.SourceUnit, text);
+  const query = Query.parse(
+    '[VersionPragma @versionRanges [VersionExpressionSets]]'
+  );
+  const matches = parseOutput.createTreeCursor().query([query]);
+  const ranges: string[] = [];
+
+  let match;
+  while ((match = matches.next())) {
+    ranges.push(
+      strip(match.captures.versionRanges[0].node.unparse(), {
+        keepProtected: true
+      })
+    );
+  }
+
+  if (ranges.length === 0) {
+    // If we didn't find pragmas but succeeded parsing the source we keep it.
+    if (parseOutput.isValid()) {
+      return [version];
+    }
+    // Otherwise we throw.
+    throw new Error(
+      `Using version ${version} did not find any pragma statement and does not parse without errors.`
+    );
+  }
+
+  return ranges;
+}
diff --git a/src/slang-utils/infer-language.ts b/src/slang-utils/infer-language.ts
deleted file mode 100644
index e3697f997..000000000
--- a/src/slang-utils/infer-language.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { VersionExpressionSets as SlangVersionExpressionSets } from '@nomicfoundation/slang/ast/index.js';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { Language } from '@nomicfoundation/slang/language/index.js';
-import { Query } from '@nomicfoundation/slang/query/index.js';
-import {
-  maxSatisfying,
-  minSatisfying,
-  minor,
-  major,
-  minVersion,
-  validRange
-} from 'semver';
-import { VersionExpressionSets } from '../slang-nodes/VersionExpressionSets.js';
-
-import type { NonterminalNode } from '@nomicfoundation/slang/cst';
-
-const supportedVersions = Language.supportedVersions();
-
-const milestoneVersions = Array.from(
-  supportedVersions.reduce((minorRanges, version) => {
-    minorRanges.add(`^${major(version)}.${minor(version)}.0`);
-    return minorRanges;
-  }, new Set<string>())
-)
-  .reverse()
-  .reduce((versions: string[], range) => {
-    versions.push(maxSatisfying(supportedVersions, range)!);
-    versions.push(minSatisfying(supportedVersions, range)!);
-    return versions;
-  }, []);
-
-export function inferLanguage(text: string): Language {
-  let inferredRange = '';
-
-  for (const version of milestoneVersions) {
-    try {
-      inferredRange = tryToCollectPragmas(text, version);
-      break;
-    } catch {}
-  }
-
-  if (!minVersion(inferredRange)) {
-    throw new Error(
-      "Couldn't infer any version from the ranges in the pragmas."
-    );
-  }
-
-  const maxSatisfyingVersion = maxSatisfying(supportedVersions, inferredRange);
-
-  return maxSatisfyingVersion
-    ? new Language(maxSatisfyingVersion)
-    : new Language(supportedVersions[supportedVersions.length - 1]);
-}
-
-function tryToCollectPragmas(text: string, version: string): string {
-  const language = new Language(version);
-  const parseOutput = language.parse(NonterminalKind.SourceUnit, text);
-  const query = Query.parse(
-    '[VersionPragma @versionRanges [VersionExpressionSets]]'
-  );
-  const matches = parseOutput.createTreeCursor().query([query]);
-  const ranges: string[] = [];
-
-  let match;
-  while ((match = matches.next())) {
-    const versionRange = new SlangVersionExpressionSets(
-      match.captures.versionRanges[0].node() as NonterminalNode
-    );
-    ranges.push(
-      // Replace all comments that could be in the expression with whitespace
-      new VersionExpressionSets(versionRange, 0).comments.reduce(
-        (range, comment) => range.replace(comment.value, ' '),
-        versionRange.cst.unparse()
-      )
-    );
-  }
-
-  // Check if we found pragmas.
-  if (ranges.length === 0) {
-    // If we didn't find pragmas but succeeded parsing the source we keep it.
-    if (parseOutput.isValid) {
-      return version;
-    }
-    // Otherwise we throw.
-    throw new Error(
-      `Using version ${version} did not find any pragma statement and does not parse without errors.`
-    );
-  }
-
-  // validRange rewrites `0.5.0 - 0.6.0` as `>=0.5.0 <=0.6.0` but it returns
-  // null if the range is not valid. We have to coerce null to 'null' so it
-  // fails the `minVersion(inferredRange)` call.
-  return ranges.map((range) => `${validRange(range)}`).join(' ');
-}
diff --git a/src/slang-utils/is-binary-operation.ts b/src/slang-utils/is-binary-operation.ts
index 3cb293577..e147b8bdf 100644
--- a/src/slang-utils/is-binary-operation.ts
+++ b/src/slang-utils/is-binary-operation.ts
@@ -1,7 +1,7 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { createKindCheckFunction } from './create-kind-check-function.js';
 
-import type { BinaryOperation, StrictAstNode } from '../slang-nodes';
+import type { BinaryOperation, StrictAstNode } from '../slang-nodes/types.d.ts';
 
 export const isBinaryOperation = createKindCheckFunction([
   NonterminalKind.AdditiveExpression,
diff --git a/src/slang-utils/is-comment.ts b/src/slang-utils/is-comment.ts
index 298b12710..b2ce5e6da 100644
--- a/src/slang-utils/is-comment.ts
+++ b/src/slang-utils/is-comment.ts
@@ -1,8 +1,8 @@
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { TerminalKind } from '@nomicfoundation/slang/cst';
 import { createKindCheckFunction } from './create-kind-check-function.js';
 
 import type { Node } from '@nomicfoundation/slang/cst';
-import type { AstNode, BlockComment, Comment } from '../slang-nodes';
+import type { AstNode, BlockComment, Comment } from '../slang-nodes/types.d.ts';
 
 export const isBlockComment = createKindCheckFunction([
   TerminalKind.MultiLineComment,
diff --git a/src/slang-utils/is-indentable-block-comment.ts b/src/slang-utils/is-indentable-block-comment.ts
index 389308f1e..7c6842a49 100644
--- a/src/slang-utils/is-indentable-block-comment.ts
+++ b/src/slang-utils/is-indentable-block-comment.ts
@@ -1,4 +1,4 @@
-import { BlockComment } from '../slang-nodes';
+import type { BlockComment } from '../slang-nodes/types.d.ts';
 
 export function isIndentableBlockComment(comment: BlockComment): boolean {
   // If the comment has multiple lines and every line starts with a star
diff --git a/src/slang-utils/loc.ts b/src/slang-utils/loc.ts
index bd57d9582..a0ea0e5ec 100644
--- a/src/slang-utils/loc.ts
+++ b/src/slang-utils/loc.ts
@@ -1,4 +1,4 @@
-import type { AstNode } from '../slang-nodes';
+import type { AstNode } from '../slang-nodes/types.d.ts';
 
 export function locStart(node: AstNode): number {
   if (typeof node === 'string' || typeof node === 'undefined') return -1;
diff --git a/src/slang-utils/metadata.ts b/src/slang-utils/metadata.ts
index ada74e923..822f547aa 100644
--- a/src/slang-utils/metadata.ts
+++ b/src/slang-utils/metadata.ts
@@ -1,5 +1,4 @@
-import { TerminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { NodeType } from '@nomicfoundation/slang/cst/index.js';
+import { TerminalKind } from '@nomicfoundation/slang/cst';
 import { createKindCheckFunction } from './create-kind-check-function.js';
 import { MultiLineComment } from '../slang-nodes/MultiLineComment.js';
 import { MultiLineNatSpecComment } from '../slang-nodes/MultiLineNatSpecComment.js';
@@ -7,8 +6,8 @@ import { SingleLineComment } from '../slang-nodes/SingleLineComment.js';
 import { SingleLineNatSpecComment } from '../slang-nodes/SingleLineNatSpecComment.js';
 
 import type { Node } from '@nomicfoundation/slang/cst';
-import type { Comment, StrictAstNode } from '../slang-nodes';
-import type { Metadata, SlangAstNode } from '../types';
+import type { Comment, StrictAstNode } from '../slang-nodes/types.d.ts';
+import type { Metadata, SlangAstNode } from '../types.d.ts';
 
 const isCommentOrWhiteSpace = createKindCheckFunction([
   TerminalKind.MultiLineComment,
@@ -22,12 +21,9 @@ const isCommentOrWhiteSpace = createKindCheckFunction([
 function getLeadingOffset(children: Node[]): number {
   let offset = 0;
   for (const child of children) {
-    if (child.type === NodeType.Nonterminal) {
-      // The node's content starts when we find the first non-terminal token.
-      return offset;
-    } else if (!isCommentOrWhiteSpace(child)) {
-      // The content of the node started if we find a non-comment,
-      // non-whitespace token.
+    if (child.isNonterminalNode() || !isCommentOrWhiteSpace(child)) {
+      // The node's content starts when we find the first non-terminal token,
+      // or if we find a non-comment, non-whitespace token.
       return offset;
     }
     offset += child.textLength.utf16;
@@ -44,14 +40,16 @@ export function getNodeMetadata(
     throw new Error("Can't initiate metadata with an undefined initialOffset");
   }
 
-  const children = ast.cst.children();
+  const children = ast.cst.children.map((child) => {
+    return child.node;
+  });
 
   let offset = initialOffset;
 
   const comments: Comment[] = [];
 
   const offsets = children.reduce((offsetsArray: number[], child) => {
-    if (child.type === NodeType.Nonterminal) {
+    if (child.isNonterminalNode()) {
       offsetsArray.push(offset);
     } else {
       switch (child.kind) {
@@ -109,7 +107,8 @@ function collectComments(
   if (node) {
     if (Array.isArray(node)) {
       return node.reduce(collectComments, comments);
-    } else if (node.comments.length > 0) {
+    }
+    if (node.comments.length > 0) {
       comments.push(...node.comments.splice(0));
     }
   }
diff --git a/src/slang-utils/sort-function-attributes.ts b/src/slang-utils/sort-function-attributes.ts
index 7385e228c..48d1a1da7 100644
--- a/src/slang-utils/sort-function-attributes.ts
+++ b/src/slang-utils/sort-function-attributes.ts
@@ -1,6 +1,6 @@
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
 
-import type { SortableAttribute } from './types';
+import type { SortableAttribute } from './types.d.ts';
 
 const visibilityKeyWords = new Set([
   'external',
diff --git a/src/slang-utils/types.d.ts b/src/slang-utils/types.d.ts
index 775b3058e..3e95c0c43 100644
--- a/src/slang-utils/types.d.ts
+++ b/src/slang-utils/types.d.ts
@@ -1,13 +1,11 @@
-import type { util } from 'prettier';
-import type { ConstructorAttribute } from '../slang-nodes/ConstructorAttribute';
-import type { FallbackFunctionAttribute } from '../slang-nodes/FallbackFunctionAttribute';
-import type { FunctionAttribute } from '../slang-nodes/FunctionAttribute';
-import type { FunctionTypeAttribute } from '../slang-nodes/FunctionTypeAttribute';
-import type { ModifierAttribute } from '../slang-nodes/ModifierAttribute';
-import type { ReceiveFunctionAttribute } from '../slang-nodes/ReceiveFunctionAttribute';
-import type { StateVariableAttribute } from '../slang-nodes/StateVariableAttribute';
-import type { UnnamedFunctionAttribute } from '../slang-nodes/UnnamedFunctionAttribute';
-import type { AstNode } from '../slang-nodes';
+import type { ConstructorAttribute } from '../slang-nodes/ConstructorAttribute.ts';
+import type { FallbackFunctionAttribute } from '../slang-nodes/FallbackFunctionAttribute.ts';
+import type { FunctionAttribute } from '../slang-nodes/FunctionAttribute.ts';
+import type { FunctionTypeAttribute } from '../slang-nodes/FunctionTypeAttribute.ts';
+import type { ModifierAttribute } from '../slang-nodes/ModifierAttribute.ts';
+import type { ReceiveFunctionAttribute } from '../slang-nodes/ReceiveFunctionAttribute.ts';
+import type { StateVariableAttribute } from '../slang-nodes/StateVariableAttribute.ts';
+import type { UnnamedFunctionAttribute } from '../slang-nodes/UnnamedFunctionAttribute.ts';
 
 type SortableAttribute =
   | ConstructorAttribute
@@ -18,15 +16,3 @@ type SortableAttribute =
   | ReceiveFunctionAttribute
   | StateVariableAttribute
   | UnnamedFunctionAttribute;
-
-declare namespace utilV2Functions {
-  function getNextNonSpaceNonCommentCharacterIndex(
-    text: string,
-    node: AstNode,
-    locEnd: (node: AstNode) => number
-  ): number | false;
-
-  function isNextLineEmptyAfterIndex(text: string, startIndex: number): boolean;
-}
-
-type utilV2 = typeof util & typeof utilV2Functions;
diff --git a/src/slangPrinter.ts b/src/slangPrinter.ts
index 6541c5fe0..4a89411e6 100644
--- a/src/slangPrinter.ts
+++ b/src/slangPrinter.ts
@@ -1,29 +1,9 @@
-import { prettierVersionSatisfies } from './slang-utils/prettier-version-satisfies.js';
 import { isBlockComment } from './slang-utils/is-comment.js';
 import { locEnd, locStart } from './slang-utils/loc.js';
 
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, StrictAstNode } from './slang-nodes';
-import type { PrintFunction } from './types';
-
-function once<T>(factory: () => T): () => T {
-  let value: T;
-  return (): T => {
-    if (typeof value === 'undefined') {
-      value = factory();
-    }
-    return value;
-  };
-}
-
-const prettierVersionCheck = once((): boolean => {
-  if (!prettierVersionSatisfies('>=2.3.0')) {
-    throw new Error(
-      'The version of prettier in your node-modules does not satisfy the required ">=2.3.0" constraint. Please update the version of Prettier.'
-    );
-  }
-  return true;
-});
+import type { AstNode, StrictAstNode } from './slang-nodes/types.d.ts';
+import type { PrintFunction } from './types.d.ts';
 
 function hasNodeIgnoreComment(node: StrictAstNode): boolean {
   // Prettier sets SourceUnit's comments to undefined after assigning comments
@@ -82,8 +62,6 @@ function genericPrint(
   options: ParserOptions<AstNode>,
   print: PrintFunction
 ): Doc {
-  prettierVersionCheck();
-
   const node = path.getNode();
 
   if (typeof node === 'undefined' || node === null) {
diff --git a/src/slangSolidityParser.ts b/src/slangSolidityParser.ts
index a32051e67..fdb313b3f 100644
--- a/src/slangSolidityParser.ts
+++ b/src/slangSolidityParser.ts
@@ -1,46 +1,43 @@
 // https://prettier.io/docs/en/plugins.html#parsers
-// import parser from '@solidity-parser/parser';
-import { Language } from '@nomicfoundation/slang/language/index.js';
-import { NonterminalKind } from '@nomicfoundation/slang/kinds/index.js';
-import { SourceUnit as SlangSourceUnit } from '@nomicfoundation/slang/ast/index.js';
+import { Parser } from '@nomicfoundation/slang/parser';
+import { NonterminalKind } from '@nomicfoundation/slang/cst';
+import { SourceUnit as SlangSourceUnit } from '@nomicfoundation/slang/ast';
 import { maxSatisfying } from 'semver';
-import { inferLanguage } from './slang-utils/infer-language.js';
+import { createParser } from './slang-utils/create-parser.js';
 import { printWarning } from './slang-utils/print-warning.js';
 import { SourceUnit } from './slang-nodes/SourceUnit.js';
 
-import type { NonterminalNode } from '@nomicfoundation/slang/cst';
-import type { Parser, ParserOptions } from 'prettier';
-import type { AstNode } from './slang-nodes/index.js';
+import type { ParserOptions } from 'prettier';
+import type { AstNode } from './slang-nodes/types.d.ts';
 
-const supportedVersions = Language.supportedVersions();
+const supportedVersions = Parser.supportedVersions();
 
 export default function parse(
   text: string,
-  _parsers: Parser[] | ParserOptions<AstNode>,
-  options = _parsers as ParserOptions<AstNode>
+  options: ParserOptions<AstNode>
 ): AstNode {
   const compiler = maxSatisfying(supportedVersions, options.compiler);
 
-  const language =
+  const parser =
     compiler && supportedVersions.includes(compiler)
-      ? new Language(compiler)
-      : inferLanguage(text);
+      ? Parser.create(compiler)
+      : createParser(text);
 
-  const parseOutput = language.parse(NonterminalKind.SourceUnit, text);
+  const parseOutput = parser.parse(NonterminalKind.SourceUnit, text);
   printWarning(
     compiler
-      ? `Using version ${language.version} based on the compiler option provided.`
-      : `Inferred version ${language.version} based on the pragma statements in the code.`
+      ? `Using version ${parser.version} based on the compiler option provided.`
+      : `Inferred version ${parser.version} based on the pragma statements in the code.`
   );
 
-  if (parseOutput.isValid) {
+  if (parseOutput.isValid()) {
     // We update the compiler version by the inferred one.
-    options.compiler = language.version;
+    options.compiler = parser.version;
     return new SourceUnit(
-      new SlangSourceUnit(parseOutput.tree() as NonterminalNode),
+      new SlangSourceUnit(parseOutput.tree.asNonterminalNode()!),
       0,
       options
     );
   }
-  throw new Error(parseOutput.errors()[0].message());
+  throw new Error(parseOutput.errors[0].message);
 }
diff --git a/src/types.d.ts b/src/types.d.ts
index 64204b285..b55d9744f 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -1,10 +1,7 @@
-import type {
-  NonterminalKind,
-  TerminalKind
-} from '@nomicfoundation/slang/kinds';
+import type { NonterminalKind, TerminalKind } from '@nomicfoundation/slang/cst';
 import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
-import type { AstNode, Comment, StrictAstNode } from './slang-nodes';
+import type { AstNode, Comment, StrictAstNode } from './slang-nodes/types.d.ts';
 
 // Adding our own options to prettier's `ParserOptions` interface.
 declare module 'prettier' {
@@ -65,7 +62,7 @@ type PrintFunction = (path: AstPath<AstNode>) => Doc;
 export type SlangAstNode =
   | ast.SourceUnit
   | ast.PragmaDirective
-  | ast.ABICoderPragma
+  | ast.AbicoderPragma
   | ast.ExperimentalPragma
   | ast.VersionPragma
   | ast.VersionRange
diff --git a/test.config.js b/test.config.js
index 00802884b..cd95186d5 100644
--- a/test.config.js
+++ b/test.config.js
@@ -1,5 +1,4 @@
 import path from 'node:path';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import createEsmUtils from 'esm-utils';
 
 const { __dirname } = createEsmUtils(import.meta);
@@ -12,20 +11,18 @@ export default {
   optimization: { minimize: false },
   target: ['browserslist'],
 
+  externals: { 'fs/promises': 'fs/promises' },
+
+  experiments: {
+    asyncWebAssembly: true,
+    topLevelAwait: true,
+    outputModule: true
+  },
+
   output: {
-    filename: 'test.cjs',
+    filename: 'test.js',
     path: path.resolve(__dirname, 'dist'),
-    globalObject: `
-      typeof globalThis !== "undefined" ? globalThis
-      : typeof global !== "undefined" ? global
-      : typeof self !== "undefined" ? self
-      : this || {}
-    `,
-    library: {
-      export: 'default',
-      name: 'format',
-      type: 'umd2'
-    }
+    library: { type: 'module' }
   },
 
   performance: {
diff --git a/tests/config/get-plugins.js b/tests/config/get-plugins.js
new file mode 100644
index 000000000..b686ea93b
--- /dev/null
+++ b/tests/config/get-plugins.js
@@ -0,0 +1,40 @@
+import path from "node:path";
+import createEsmUtils from "esm-utils";
+import getPrettier from "./get-prettier.js";
+
+const { __dirname } = createEsmUtils(import.meta);
+
+// populate the root object for the standalone in node
+if (process.env.TEST_STANDALONE) {
+  const root =
+    typeof globalThis !== "undefined"
+      ? globalThis
+      : typeof global !== "undefined"
+        ? global
+        : typeof self !== "undefined"
+          ? self
+          : this || {};
+  root.prettier = await getPrettier();
+  root["fs/promises"] = await import("fs/promises");
+}
+
+function getPluginsInternal() {
+  return Promise.all(
+    process.env.TEST_STANDALONE
+      ? [
+          import("prettier/plugins/babel"),
+          import("prettier/plugins/markdown"),
+          import(path.join(__dirname, "../../dist/standalone.js")),
+        ]
+      : [path.join(__dirname, "../../src/index.ts")],
+  ).then((modules) => modules.map((module) => module.default ?? module));
+}
+
+let promise;
+function getPlugins() {
+  promise = promise ?? getPluginsInternal();
+
+  return promise;
+}
+
+export default getPlugins;
diff --git a/tests/config/get-prettier.js b/tests/config/get-prettier.js
index 6a7446292..261595ce3 100644
--- a/tests/config/get-prettier.js
+++ b/tests/config/get-prettier.js
@@ -1,6 +1,6 @@
 function getPrettierInternal() {
   const entry = process.env.TEST_STANDALONE
-    ? new URL("./require-standalone.cjs", import.meta.url)
+    ? "prettier/standalone"
     : "prettier";
 
   return import(entry).then((module) => module.default);
diff --git a/tests/config/require-standalone.cjs b/tests/config/require-standalone.cjs
deleted file mode 100644
index 8b9d52d3a..000000000
--- a/tests/config/require-standalone.cjs
+++ /dev/null
@@ -1,64 +0,0 @@
-"use strict";
-
-const path = require("path");
-const vm = require("vm");
-const prettier = require("prettier");
-const satisfies = require("semver/functions/satisfies");
-const createSandBox = require("./utils/create-sandbox.cjs");
-
-const prettierPath = path.dirname(require.resolve("prettier"));
-const pluginPrefix = satisfies(prettier.version, "^2.3.0")
-  ? "parser-" // Prettier V2
-  : "plugins/"; // Prettier V3
-
-const sandbox = createSandBox({
-  files: [
-    path.join(prettierPath, "standalone.js"),
-    path.join(prettierPath, `${pluginPrefix}babel.js`),
-    path.join(prettierPath, `${pluginPrefix}markdown.js`),
-    path.join(__dirname, "../../dist/standalone.cjs"),
-  ],
-});
-
-// TODO: maybe expose (and write tests) for `format`, `utils`, and
-// `__debug` methods
-module.exports = {
-  formatWithCursor(input, options) {
-    return vm.runInNewContext(
-      `
-        const options = {
-          ...$$$options,
-          plugins: [
-            ...Object.values(prettierPlugins),
-            ...($$$options.plugins || []),
-          ],
-        };
-        prettier.formatWithCursor($$$input, options);
-      `,
-      { $$$input: input, $$$options: options, ...sandbox },
-    );
-  },
-
-  __debug: {
-    parse(input, options, devOptions) {
-      return vm.runInNewContext(
-        `
-          const options = {
-            ...$$$options,
-            plugins: [
-              ...Object.values(prettierPlugins),
-              ...($$$options.plugins || []),
-            ],
-          };
-          prettier.__debug.parse($$$input, options, $$$devOptions);
-        `,
-        {
-          $$$input: input,
-          $$$options: options,
-          $$$devOptions: devOptions,
-          ...sandbox,
-        },
-      );
-    },
-  },
-};
diff --git a/tests/config/run-format-test.js b/tests/config/run-format-test.js
index afaa40686..4720028e8 100644
--- a/tests/config/run-format-test.js
+++ b/tests/config/run-format-test.js
@@ -5,6 +5,7 @@ import url from "node:url";
 import createEsmUtils from "esm-utils";
 
 import getPrettier from "./get-prettier.js";
+import getPlugins from "./get-plugins.js";
 import compileContract from "./utils/compile-contract.js";
 import consistentEndOfLine from "./utils/consistent-end-of-line.js";
 import createSnapshot from "./utils/create-snapshot.js";
@@ -13,7 +14,7 @@ import visualizeEndOfLine from "./utils/visualize-end-of-line.js";
 
 const { __dirname } = createEsmUtils(import.meta);
 
-const { FULL_TEST, TEST_STANDALONE } = process.env;
+const { FULL_TEST } = process.env;
 const BOM = "\uFEFF";
 
 const CURSOR_PLACEHOLDER = "<|>";
@@ -189,9 +190,6 @@ function runFormatTest(fixtures, parsers, options) {
 
     describe(title, () => {
       const formatOptions = {
-        plugins: TEST_STANDALONE
-          ? []
-          : [path.join(__dirname, "../../src/index.js")],
         printWidth: 80,
         ...options,
         filepath: filename,
@@ -380,9 +378,12 @@ function shouldSkipEolTest(code, options) {
 
 async function parse(source, options) {
   const prettier = await getPrettier();
-  const { ast } = await prettier.__debug.parse(source, options, {
-    massage: true,
-  });
+
+  const { ast } = await prettier.__debug.parse(
+    source,
+    { ...options, plugins: await getPlugins() },
+    { massage: true },
+  );
   return ast;
 }
 
@@ -436,7 +437,7 @@ async function format(originalText, originalOptions) {
 
   const { formatted: output, cursorOffset } = await prettier.formatWithCursor(
     input,
-    options,
+    { ...options, plugins: await getPlugins() },
   );
   const outputWithCursor = insertCursor(output, cursorOffset);
   const eolVisualizedOutput = visualizeEndOfLine(outputWithCursor);
diff --git a/tests/config/utils/create-sandbox.cjs b/tests/config/utils/create-sandbox.cjs
deleted file mode 100644
index 903b53c00..000000000
--- a/tests/config/utils/create-sandbox.cjs
+++ /dev/null
@@ -1,14 +0,0 @@
-"use strict";
-const vm = require("vm");
-const fs = require("fs");
-
-function createSandBox({ files }) {
-  const source = files.map((file) => fs.readFileSync(file, "utf8")).join(";");
-  const sandbox = vm.createContext();
-
-  vm.runInContext(source, sandbox);
-
-  return sandbox;
-}
-
-module.exports = createSandBox;
diff --git a/tests/format/HexLiteral/HexLiteral.sol b/tests/format/HexLiteral/HexLiteral.sol
index 69e723275..894b4f70a 100644
--- a/tests/format/HexLiteral/HexLiteral.sol
+++ b/tests/format/HexLiteral/HexLiteral.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract HexLiteral {
   bytes8 hex1 = hex'DeadBeef';
diff --git a/tests/format/HexLiteral/__snapshots__/format.test.js.snap b/tests/format/HexLiteral/__snapshots__/format.test.js.snap
index c97f7b6d0..116fabf26 100644
--- a/tests/format/HexLiteral/__snapshots__/format.test.js.snap
+++ b/tests/format/HexLiteral/__snapshots__/format.test.js.snap
@@ -8,7 +8,7 @@ singleQuote: false
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract HexLiteral {
   bytes8 hex1 = hex'DeadBeef';
@@ -17,7 +17,7 @@ contract HexLiteral {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract HexLiteral {
     bytes8 hex1 = hex"DeadBeef";
@@ -35,7 +35,7 @@ singleQuote: true
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract HexLiteral {
   bytes8 hex1 = hex'DeadBeef';
@@ -44,7 +44,7 @@ contract HexLiteral {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract HexLiteral {
     bytes8 hex1 = hex'DeadBeef';
diff --git a/tests/format/ModifierInvocations/ModifierInvocations.sol b/tests/format/ModifierInvocations/ModifierInvocations.sol
index 960e75152..c1e762ac9 100644
--- a/tests/format/ModifierInvocations/ModifierInvocations.sol
+++ b/tests/format/ModifierInvocations/ModifierInvocations.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ModifierDefinitions {
   // We enforce the use of parentheses in modifiers without parameters.
diff --git a/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap b/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap
index 5167c3308..b6f351be8 100644
--- a/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap
+++ b/tests/format/ModifierInvocations/__snapshots__/format.test.js.snap
@@ -7,7 +7,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ModifierDefinitions {
   // We enforce the use of parentheses in modifiers without parameters.
@@ -26,7 +26,7 @@ contract ModifierInvocations is ModifierDefinitions {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ModifierDefinitions {
     // We enforce the use of parentheses in modifiers without parameters.
diff --git a/tests/format/NumberLiteral/NumberLiteral.sol b/tests/format/NumberLiteral/NumberLiteral.sol
index 3a6f9e877..a52ccffb1 100644
--- a/tests/format/NumberLiteral/NumberLiteral.sol
+++ b/tests/format/NumberLiteral/NumberLiteral.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract NumberLiteral {
   function numbers()public {
diff --git a/tests/format/NumberLiteral/__snapshots__/format.test.js.snap b/tests/format/NumberLiteral/__snapshots__/format.test.js.snap
index 9f0b62fb6..6caf4bdb5 100644
--- a/tests/format/NumberLiteral/__snapshots__/format.test.js.snap
+++ b/tests/format/NumberLiteral/__snapshots__/format.test.js.snap
@@ -7,7 +7,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract NumberLiteral {
   function numbers()public {
@@ -22,7 +22,7 @@ contract NumberLiteral {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract NumberLiteral {
     function numbers() public {
diff --git a/tests/format/Parentheses/AddNoParentheses.sol b/tests/format/Parentheses/AddNoParentheses.sol
index 216ff455e..f65a8a239 100644
--- a/tests/format/Parentheses/AddNoParentheses.sol
+++ b/tests/format/Parentheses/AddNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract AddNoParentheses {
     function addAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/BitAndNoParentheses.sol b/tests/format/Parentheses/BitAndNoParentheses.sol
index b37c362d7..8a2b9a82a 100644
--- a/tests/format/Parentheses/BitAndNoParentheses.sol
+++ b/tests/format/Parentheses/BitAndNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitAndNoParentheses {
     function bitAndAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/BitOrNoParentheses.sol b/tests/format/Parentheses/BitOrNoParentheses.sol
index b010b1c3b..dd2d4d351 100644
--- a/tests/format/Parentheses/BitOrNoParentheses.sol
+++ b/tests/format/Parentheses/BitOrNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitOrNoParentheses {
     function bitOrAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/BitXorNoParentheses.sol b/tests/format/Parentheses/BitXorNoParentheses.sol
index 033865f4e..21ff78baf 100644
--- a/tests/format/Parentheses/BitXorNoParentheses.sol
+++ b/tests/format/Parentheses/BitXorNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitXorNoParentheses {
     function bitXorAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/DivNoParentheses.sol b/tests/format/Parentheses/DivNoParentheses.sol
index ce3763586..8e33166e0 100644
--- a/tests/format/Parentheses/DivNoParentheses.sol
+++ b/tests/format/Parentheses/DivNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract DivNoParentheses {
     function divAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/ExpNoParentheses.sol b/tests/format/Parentheses/ExpNoParentheses.sol
index e33d3dd30..335876277 100644
--- a/tests/format/Parentheses/ExpNoParentheses.sol
+++ b/tests/format/Parentheses/ExpNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ExpNoParentheses {
     function expAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/LogicNoParentheses.sol b/tests/format/Parentheses/LogicNoParentheses.sol
index 473e24085..8a246ba70 100644
--- a/tests/format/Parentheses/LogicNoParentheses.sol
+++ b/tests/format/Parentheses/LogicNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract LogicNoParentheses {
     function orOr(bool a, bool b, bool c) public pure returns (bool) {
diff --git a/tests/format/Parentheses/ModNoParentheses.sol b/tests/format/Parentheses/ModNoParentheses.sol
index da1a0677e..ce1cb41e3 100644
--- a/tests/format/Parentheses/ModNoParentheses.sol
+++ b/tests/format/Parentheses/ModNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ModNoParentheses {
     function modAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/MulNoParentheses.sol b/tests/format/Parentheses/MulNoParentheses.sol
index dad59cccf..8ff3f03f4 100644
--- a/tests/format/Parentheses/MulNoParentheses.sol
+++ b/tests/format/Parentheses/MulNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract MulNoParentheses {
     function mulAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/ShiftLNoParentheses.sol b/tests/format/Parentheses/ShiftLNoParentheses.sol
index a455b376e..40c36d005 100644
--- a/tests/format/Parentheses/ShiftLNoParentheses.sol
+++ b/tests/format/Parentheses/ShiftLNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ShiftLNoParentheses {
     function shiftLAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/ShiftRNoParentheses.sol b/tests/format/Parentheses/ShiftRNoParentheses.sol
index 9be623ade..16850aa38 100644
--- a/tests/format/Parentheses/ShiftRNoParentheses.sol
+++ b/tests/format/Parentheses/ShiftRNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ShiftRNoParentheses {
     function shiftRAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/SubNoParentheses.sol b/tests/format/Parentheses/SubNoParentheses.sol
index 71cdb2c63..a6e8ff7e5 100644
--- a/tests/format/Parentheses/SubNoParentheses.sol
+++ b/tests/format/Parentheses/SubNoParentheses.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract SubNoParentheses {
     function subAdd(uint256 a, uint256 b, uint256 c)
diff --git a/tests/format/Parentheses/__snapshots__/format.test.js.snap b/tests/format/Parentheses/__snapshots__/format.test.js.snap
index 12e774509..22cdd6314 100644
--- a/tests/format/Parentheses/__snapshots__/format.test.js.snap
+++ b/tests/format/Parentheses/__snapshots__/format.test.js.snap
@@ -7,7 +7,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract AddNoParentheses {
     function addAdd(uint256 a, uint256 b, uint256 c)
@@ -101,7 +101,7 @@ contract AddNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract AddNoParentheses {
     function addAdd(
@@ -203,7 +203,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitAndNoParentheses {
     function bitAndAdd(uint256 a, uint256 b, uint256 c)
@@ -297,7 +297,7 @@ contract BitAndNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitAndNoParentheses {
     function bitAndAdd(
@@ -399,7 +399,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitOrNoParentheses {
     function bitOrAdd(uint256 a, uint256 b, uint256 c)
@@ -493,7 +493,7 @@ contract BitOrNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitOrNoParentheses {
     function bitOrAdd(
@@ -595,7 +595,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitXorNoParentheses {
     function bitXorAdd(uint256 a, uint256 b, uint256 c)
@@ -689,7 +689,7 @@ contract BitXorNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract BitXorNoParentheses {
     function bitXorAdd(
@@ -791,7 +791,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract DivNoParentheses {
     function divAdd(uint256 a, uint256 b, uint256 c)
@@ -885,7 +885,7 @@ contract DivNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract DivNoParentheses {
     function divAdd(
@@ -987,7 +987,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ExpNoParentheses {
     function expAdd(uint256 a, uint256 b, uint256 c)
@@ -1081,7 +1081,7 @@ contract ExpNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ExpNoParentheses {
     function expAdd(
@@ -1183,7 +1183,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract LogicNoParentheses {
     function orOr(bool a, bool b, bool c) public pure returns (bool) {
@@ -1205,7 +1205,7 @@ contract LogicNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract LogicNoParentheses {
     function orOr(bool a, bool b, bool c) public pure returns (bool) {
@@ -1235,7 +1235,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ModNoParentheses {
     function modAdd(uint256 a, uint256 b, uint256 c)
@@ -1329,7 +1329,7 @@ contract ModNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ModNoParentheses {
     function modAdd(
@@ -1431,7 +1431,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract MulNoParentheses {
     function mulAdd(uint256 a, uint256 b, uint256 c)
@@ -1525,7 +1525,7 @@ contract MulNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract MulNoParentheses {
     function mulAdd(
@@ -1627,7 +1627,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ShiftLNoParentheses {
     function shiftLAdd(uint256 a, uint256 b, uint256 c)
@@ -1721,7 +1721,7 @@ contract ShiftLNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ShiftLNoParentheses {
     function shiftLAdd(
@@ -1823,7 +1823,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ShiftRNoParentheses {
     function shiftRAdd(uint256 a, uint256 b, uint256 c)
@@ -1917,7 +1917,7 @@ contract ShiftRNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract ShiftRNoParentheses {
     function shiftRAdd(
@@ -2019,7 +2019,7 @@ printWidth: 80
                                                                                 | printWidth
 =====================================input======================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract SubNoParentheses {
     function subAdd(uint256 a, uint256 b, uint256 c)
@@ -2113,7 +2113,7 @@ contract SubNoParentheses {
 
 =====================================output=====================================
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.27;
+pragma solidity 0.8.28;
 
 contract SubNoParentheses {
     function subAdd(
diff --git a/tests/integration/node.test.js b/tests/integration/node.test.js
index 90303980f..d1785af76 100644
--- a/tests/integration/node.test.js
+++ b/tests/integration/node.test.js
@@ -1,4 +1,4 @@
-import format from '../../dist/test.cjs';
+import format from '../../dist/test.js';
 
 test('Should run a test app in a node environment', async () => {
   const data = 'contract    CheckPackage {}';
diff --git a/tests/integration/sandbox-test-app.cjs b/tests/integration/sandbox-test-app.cjs
deleted file mode 100644
index 208372ba1..000000000
--- a/tests/integration/sandbox-test-app.cjs
+++ /dev/null
@@ -1,16 +0,0 @@
-const path = require('path');
-const vm = require('vm');
-const createSandBox = require('../config/utils/create-sandbox.cjs');
-
-const sandbox = createSandBox({
-  files: [path.join(__dirname, '../../dist/test.cjs')]
-});
-
-module.exports = {
-  format(input) {
-    return vm.runInNewContext('format($$$input);', {
-      $$$input: input,
-      ...sandbox
-    });
-  }
-};
diff --git a/tests/integration/sandbox.test.js b/tests/integration/sandbox.test.js
deleted file mode 100644
index 40b66ac83..000000000
--- a/tests/integration/sandbox.test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-test('Should run a test app in a sandbox', async () => {
-  const data = 'contract    CheckPackage {}';
-  const entry = new URL('./sandbox-test-app.cjs', import.meta.url);
-
-  const { format } = await import(entry).then((module) => module.default);
-
-  expect(await format(data)).toEqual('contract CheckPackage {}\n');
-});
diff --git a/tests/integration/test-app.js b/tests/integration/test-app.js
index ba6e4a662..f43e28a40 100644
--- a/tests/integration/test-app.js
+++ b/tests/integration/test-app.js
@@ -1,10 +1,10 @@
-import prettier from 'prettier/standalone.js';
-import solidityPlugin from '../../dist/standalone.cjs';
+import prettier from 'prettier/standalone';
+import '../../dist/standalone.js';
 
 export default async function format(code) {
   const formattedCode = await prettier.format(code, {
     parser: 'slang-solidity',
-    plugins: [solidityPlugin]
+    plugins: prettierPlugins
   });
   return formattedCode;
 }
diff --git a/tests/unit/prettier-version/esmock-plugin.js b/tests/unit/prettier-version/esmock-plugin.js
deleted file mode 100644
index 65df6ca67..000000000
--- a/tests/unit/prettier-version/esmock-plugin.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import esmock from 'esmock';
-import prettier from 'prettier';
-
-const esmockPlugin = async () => {
-  const prettierMock = { ...prettier, version: '2.2.1' };
-
-  const plugin = await esmock(
-    '../../../src/index.ts',
-    {},
-    {
-      prettier: prettierMock
-    }
-  );
-
-  return { plugin, prettierMock };
-};
-
-export default esmockPlugin;
diff --git a/tests/unit/prettier-version/index.test.js b/tests/unit/prettier-version/index.test.js
deleted file mode 100644
index 9a0b2daf7..000000000
--- a/tests/unit/prettier-version/index.test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-test('should throw if the installed version of prettier is less than v2.3.0', async () => {
-  const entry = process.env.TEST_STANDALONE
-    ? new URL('./proxyquire-plugin.cjs', import.meta.url) // standalone uses proxyquire to mock cjs
-    : './esmock-plugin.js'; // uses esmock to mock esm
-
-  const { plugin, prettierMock } = await import(entry).then((module) =>
-    module.default()
-  );
-
-  const data = 'contract CheckPrettierVersion {}';
-
-  const options = {
-    plugins: [plugin],
-    parser: 'slang-solidity'
-  };
-
-  await expect(async () => {
-    await prettierMock.formatWithCursor(data, options);
-  }).rejects.toThrow('>=2.3.0');
-});
diff --git a/tests/unit/prettier-version/proxyquire-plugin.cjs b/tests/unit/prettier-version/proxyquire-plugin.cjs
deleted file mode 100644
index 88e77975e..000000000
--- a/tests/unit/prettier-version/proxyquire-plugin.cjs
+++ /dev/null
@@ -1,14 +0,0 @@
-const proxyquire = require('proxyquire');
-const prettier = require('prettier/standalone.js');
-
-const proxyquirePlugin = () => {
-  const prettierMock = { ...prettier, version: '2.2.1', '@global': true };
-
-  const plugin = proxyquire('../../../dist/standalone.cjs', {
-    'prettier/standalone': prettierMock
-  });
-
-  return { plugin, prettierMock };
-};
-
-module.exports = proxyquirePlugin;
diff --git a/tests/unit/slang-utils/infer-language.test.js b/tests/unit/slang-utils/create-parser.test.js
similarity index 85%
rename from tests/unit/slang-utils/infer-language.test.js
rename to tests/unit/slang-utils/create-parser.test.js
index c1f882ea5..968106298 100644
--- a/tests/unit/slang-utils/infer-language.test.js
+++ b/tests/unit/slang-utils/create-parser.test.js
@@ -1,8 +1,8 @@
-import { Language } from '@nomicfoundation/slang/language/index.js';
-import { inferLanguage } from '../../../src/slang-utils/infer-language.js';
+import { Parser } from '@nomicfoundation/slang/parser';
+import { createParser } from '../../../src/slang-utils/create-parser.js';
 
 describe('inferLanguage', function () {
-  const supportedVersions = Language.supportedVersions();
+  const supportedVersions = Parser.supportedVersions();
   const latestSupportedVersion =
     supportedVersions[supportedVersions.length - 1];
 
@@ -90,14 +90,14 @@ describe('inferLanguage', function () {
 
   for (const { description, source, version } of fixtures) {
     test(description, function () {
-      const inferredLanguage = inferLanguage(source);
-      expect(inferredLanguage.version).toEqual(version);
+      const parser = createParser(source);
+      expect(parser.version).toEqual(version);
     });
   }
 
-  test('should throw an error if there are incompatible ranges', function () {
+  test.skip('should throw an error if there are incompatible ranges', function () {
     expect(() =>
-      inferLanguage(`pragma solidity ^0.8.0; pragma solidity 0.7.6;`)
+      createParser(`pragma solidity ^0.8.0; pragma solidity 0.7.6;`)
     ).toThrow();
   });
 });
diff --git a/tsconfig.json b/tsconfig.json
index cec75c6de..7449a88e3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,8 +6,8 @@
     "strictPropertyInitialization": true,
     "sourceMap": true,
     "target": "es6",
-    "module": "es2022",
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "strict": true,
     "esModuleInterop": true
   },
diff --git a/webpack.config.js b/webpack.config.js
index b19e28dec..a697f9fbe 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,8 +1,16 @@
 import path from 'node:path';
 import createEsmUtils from 'esm-utils';
+import webpack from 'webpack';
 
 const { __dirname } = createEsmUtils(import.meta);
 
+const globalObject = `
+  typeof globalThis !== 'undefined' ? globalThis
+  : typeof global !== 'undefined' ? global
+  : typeof self !== 'undefined' ? self
+  : this || {}
+`;
+
 // This is the production and development configuration.
 // It is focused on developer experience, fast rebuilds, and a minimal bundle.
 export default (webpackEnv) => {
@@ -12,26 +20,37 @@ export default (webpackEnv) => {
     entry: './src/index.js',
 
     // Avoid bundling Prettier
+    externalsType: 'global',
     externals: {
-      prettier: {
-        // use 'prettier/standalone' in case the project importing this file is
-        // bundling for the browser.
-        amd: 'prettier/standalone',
-        commonjs: 'prettier/standalone',
-        commonjs2: 'prettier/standalone',
-        root: 'prettier' // global variable if it was loaded by the browser
-      }
+      prettier: 'prettier',
+      'fs/promises': 'fs/promises'
     },
 
+    plugins: [
+      // TODO: investigate a cleaner way to populate the global variable
+      // prettierPlugins in a browser.
+      new webpack.BannerPlugin({
+        banner: `
+var root = ${globalObject};
+root["prettierPlugins"] = root["prettierPlugins"] || {}, root["prettierPlugins"]["solidity"] = __webpack_exports__default;
+`,
+        footer: true,
+        raw: true
+      })
+    ],
     mode: isEnvProduction ? 'production' : 'development',
     bail: isEnvProduction,
     devtool: 'source-map',
 
     resolve: {
       extensions: ['.ts', '.js'],
-      extensionAlias: {
-        '.js': ['.js', '.ts']
-      }
+      extensionAlias: { '.js': ['.js', '.ts'] }
+    },
+
+    experiments: {
+      asyncWebAssembly: true,
+      topLevelAwait: true,
+      outputModule: true
     },
 
     module: {
@@ -44,28 +63,15 @@ export default (webpackEnv) => {
       ]
     },
 
-    optimization: {
-      minimize: isEnvProduction
-    },
+    optimization: { minimize: isEnvProduction },
     target: ['browserslist'],
     output: {
+      globalObject,
+      chunkFormat: false,
       path: path.resolve(__dirname, 'dist'),
-      filename: 'standalone.cjs',
+      filename: 'standalone.js',
       clean: true,
-      globalObject: `
-        typeof globalThis !== 'undefined' ? globalThis
-        : typeof global !== 'undefined' ? global
-        : typeof self !== 'undefined' ? self
-        : this || {}
-      `,
-      library: {
-        export: 'default',
-        name: {
-          commonjs: 'prettierPluginSolidity',
-          root: ['prettierPlugins', 'solidity']
-        },
-        type: 'umd2'
-      }
+      library: { type: 'module' }
     },
     performance: {
       maxEntrypointSize: 1024 * 1024,