diff --git a/maud_macros/src/parse.rs b/maud_macros/src/parse.rs
index 8fca3db4..92ea3dcb 100644
--- a/maud_macros/src/parse.rs
+++ b/maud_macros/src/parse.rs
@@ -15,9 +15,11 @@ use proc_macro::{
 use proc_macro::token_stream;
 use std::iter;
 use std::mem;
+use std::iter::FromIterator;
 
 use literalext::LiteralExt;
 
+
 use super::build::Builder;
 use super::ParseResult;
 
@@ -294,21 +296,21 @@ impl Parser {
     }
 
     fn match_arms(&mut self) -> ParseResult<TokenStream> {
-        let mut arms = Vec::new();
+        let mut arms: token_stream::IntoIter;
         while let Some(arm) = self.match_arm()? {
-            arms.push(arm);
+            arms.chain(arm.into_iter());
         }
-        Ok(arms.into_iter().collect())
+        Ok(TokenStream::from_iter(arms.into_iter()))
     }
 
     fn match_arm(&mut self) -> ParseResult<Option<TokenStream>> {
-        let mut pat = Vec::new();
+        let mut pat: Vec<TokenTree> = Vec::new();
         loop {
             match self.peek2() {
                 Some((
-                    eq @ TokenTree { kind: TokenNode::Op('=', Spacing::Joint), .. },
-                    Some(gt @ TokenTree { kind: TokenNode::Op('>', _), .. }),
-                )) => {
+                    eq @ TokenTree::Op(o1),
+                    Some(gt @ TokenTree::Op(o2)),
+                )) if o1.op() == '=' && o2.op() == '>' && o1.spacing() == Spacing::Joint => {
                     self.advance2();
                     pat.push(eq);
                     pat.push(gt);
@@ -328,23 +330,25 @@ impl Parser {
         }
         let body = match self.next() {
             // $pat => { $stmts }
-            Some(TokenTree { kind: TokenNode::Group(Delimiter::Brace, body), span }) => {
-                let body = self.block(body, span)?;
+            Some(TokenTree::Group(body)) if body.delimiter() == Delimiter::Brace => {
+                let body: TokenTree = self.block(body.stream(), body.span())?;
                 // Trailing commas are optional if the match arm is a braced block
-                if let Some(TokenTree { kind: TokenNode::Op(',', _), .. }) = self.peek() {
-                    self.advance();
+                if let Some(TokenTree::Op(o)) = self.peek() {
+                    if o.op() == ',' {
+                        self.advance();
+                    }
                 }
                 body
             },
             // $pat => $expr
             Some(first_token) => {
-                let mut span = first_token.span;
+                let mut span = first_token.span();
                 let mut body = vec![first_token];
                 loop {
                     match self.next() {
-                        Some(TokenTree { kind: TokenNode::Op(',', _), .. }) => break,
+                        Some(TokenTree::Op(o)) if o.op() == ',' => break,
                         Some(token) => {
-                            if let Some(bigger_span) = span.join(token.span) {
+                            if let Some(bigger_span) = span.join(token.span()) {
                                 span = bigger_span;
                             }
                             body.push(token);