diff --git a/lang/ast/block.c b/lang/ast/block.c
index 3f06570..e355840 100644
--- a/lang/ast/block.c
+++ b/lang/ast/block.c
@@ -1,6 +1,7 @@
 #include "block.h"
 
 #include "ctx.h"
+#include "expr/expr.h"
 #include "iterate.h"
 #include "node.h"
 
@@ -64,7 +65,10 @@ static struct token_parse_result parse_expr_begin(
 	struct ivy_ast_block_node *node
 		= (struct ivy_ast_block_node *)(state->s_base.s_node);
 
-	parser_push_state(ctx, IVY_AST_EXPR, 0);
+	struct expr_parser_state *expr
+		= (struct expr_parser_state *)parser_push_state(
+			ctx, IVY_AST_EXPR, 0);
+	expr->s_terminator = state->s_terminator;
 	return PARSE_RESULT(IVY_OK, PARSE_REPEAT_TOKEN);
 }
 
@@ -79,11 +83,6 @@ static enum ivy_status add_child(
 	return IVY_OK;
 }
 
-static void init_state(struct ivy_parser *ctx, struct parser_state *sp, uintptr_t arg)
-{
-	struct class_parser_state *state = (struct class_parser_state *)sp;
-}
-
 static void collect_children(
 	struct ivy_ast_node *node, struct ivy_ast_node_iterator *iterator)
 {
@@ -98,7 +97,6 @@ static void collect_children(
 
 struct ast_node_type block_node_ops = {
 	.n_add_child = add_child,
-	.n_init_state = init_state,
 	.n_collect_children = collect_children,
 	.n_state_size = sizeof(struct block_parser_state),
 	.n_node_size = sizeof(struct ivy_ast_block_node),