diff --git a/lib/writer.js b/lib/writer.js
index e6b1ed0a..653fcf61 100644
--- a/lib/writer.js
+++ b/lib/writer.js
@@ -93,7 +93,10 @@ export function write(ast, { templates: ts = templates } = {}) {
     ]);
   }
   function identifier(id) {
-    return wrap`${ts.trivia(id.trivia)}${reference(id.value)}${token(id.tokens.separator)}`;
+    return ts.wrap([
+      reference_token(id.tokens.value),
+      token(id.tokens.separator)
+    ]);
   }
   function make_ext_at(it) {
     const { rhsType } = it.params;
diff --git a/test/writer.js b/test/writer.js
index 21811d3f..d2a71abe 100644
--- a/test/writer.js
+++ b/test/writer.js
@@ -34,10 +34,10 @@ describe("Writer template functions", () => {
   });
 
   it("catches trivia", () => {
-    const result = rewrite("/* longcat is long */ interface X {};", {
+    const result = rewrite("/* longcat is long */ [Exposed=( Window )] interface X {};", {
       trivia: bracket
     });
-    expect(result).toBe("</* longcat is long */ >interface< >X< >{<>}<>;<>");
+    expect(result).toBe("</* longcat is long */ >[<>Exposed<>=<>(< >Window< >)<>]< >interface< >X< >{<>}<>;<>");
   });
 
   it("catches names", () => {