diff --git a/compiler/surface/parser.messages b/compiler/surface/parser.messages
index f1b93a2e..7818c65a 100644
--- a/compiler/surface/parser.messages
+++ b/compiler/surface/parser.messages
@@ -1,6 +1,6 @@
 source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR CONTENT TEXT YEAR
 ##
-## Ends in an error in state: 335.
+## Ends in an error in state: 339.
 ##
 ## list(enum_decl_line) -> enum_decl_line . list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -12,7 +12,7 @@ expected another enum case, or a new declaration or scope use
 
 source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR CONTENT YEAR
 ##
-## Ends in an error in state: 330.
+## Ends in an error in state: 334.
 ##
 ## enum_decl_line_payload -> CONTENT . typ [ SCOPE END_CODE DECLARATION ALT ]
 ##
@@ -24,7 +24,7 @@ expected a content type
 
 source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 329.
+## Ends in an error in state: 333.
 ##
 ## enum_decl_line -> ALT constructor . option(enum_decl_line_payload) [ SCOPE END_CODE DECLARATION ALT ]
 ##
@@ -36,7 +36,7 @@ expected a payload for your enum case, or another case or declaration
 
 source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON ALT YEAR
 ##
-## Ends in an error in state: 328.
+## Ends in an error in state: 332.
 ##
 ## enum_decl_line -> ALT . constructor option(enum_decl_line_payload) [ SCOPE END_CODE DECLARATION ALT ]
 ##
@@ -48,7 +48,7 @@ expected the name of an enum case
 
 source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR COLON YEAR
 ##
-## Ends in an error in state: 327.
+## Ends in an error in state: 331.
 ##
 ## code_item -> DECLARATION ENUM constructor COLON . list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -60,7 +60,7 @@ expected an enum case
 
 source_file: BEGIN_CODE DECLARATION ENUM CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 326.
+## Ends in an error in state: 330.
 ##
 ## code_item -> DECLARATION ENUM constructor . COLON list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -72,7 +72,7 @@ expected a colon
 
 source_file: BEGIN_CODE DECLARATION ENUM YEAR
 ##
-## Ends in an error in state: 325.
+## Ends in an error in state: 329.
 ##
 ## code_item -> DECLARATION ENUM . constructor COLON list(enum_decl_line) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -91,7 +91,7 @@ expected the name of your enum
 
 source_file: BEGIN_CODE DECLARATION SCOPE CONSTRUCTOR COLON YEAR
 ##
-## Ends in an error in state: 300.
+## Ends in an error in state: 304.
 ##
 ## code_item -> DECLARATION SCOPE constructor COLON . nonempty_list(scope_decl_item) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -103,7 +103,7 @@ expected a context item introduced by "context"
 
 source_file: BEGIN_CODE DECLARATION SCOPE CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 299.
+## Ends in an error in state: 303.
 ##
 ## code_item -> DECLARATION SCOPE constructor . COLON nonempty_list(scope_decl_item) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -115,7 +115,7 @@ expected a colon followed by the list of context items of this scope
 
 source_file: BEGIN_CODE DECLARATION SCOPE YEAR
 ##
-## Ends in an error in state: 298.
+## Ends in an error in state: 302.
 ##
 ## code_item -> DECLARATION SCOPE . constructor COLON nonempty_list(scope_decl_item) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -127,7 +127,7 @@ expected the name of the scope you are declaring
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION IDENT DEPENDS COLLECTION YEAR
 ##
-## Ends in an error in state: 285.
+## Ends in an error in state: 289.
 ##
 ## typ -> collection_marked . typ [ STATE SCOPE OUTPUT INTERNAL INPUT IDENT END_CODE DEPENDS DECLARATION DATA CONTEXT CONDITION ALT ]
 ##
@@ -139,7 +139,7 @@ expected a new struct data, or another declaration or scope use
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION IDENT DEPENDS TEXT YEAR
 ##
-## Ends in an error in state: 293.
+## Ends in an error in state: 297.
 ##
 ## list(struct_scope) -> struct_scope . list(struct_scope) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -151,7 +151,7 @@ expected a new struct data, or another declaration or scope use
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION IDENT DEPENDS YEAR
 ##
-## Ends in an error in state: 289.
+## Ends in an error in state: 293.
 ##
 ## struct_scope_func -> DEPENDS . typ [ STATE SCOPE OUTPUT INTERNAL INPUT IDENT END_CODE DECLARATION DATA CONTEXT CONDITION ]
 ##
@@ -163,7 +163,7 @@ expected the type of the parameter of this struct data function
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION IDENT YEAR
 ##
-## Ends in an error in state: 288.
+## Ends in an error in state: 292.
 ##
 ## struct_scope -> struct_scope_base . option(struct_scope_func) [ SCOPE END_CODE DECLARATION DATA CONDITION ]
 ##
@@ -175,7 +175,7 @@ expected a new struct data, or another declaration or scope use
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON CONDITION YEAR
 ##
-## Ends in an error in state: 295.
+## Ends in an error in state: 299.
 ##
 ## struct_scope_base -> condition_pos . ident [ SCOPE END_CODE DEPENDS DECLARATION DATA CONDITION ]
 ##
@@ -187,7 +187,7 @@ expected the name of this struct condition
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON DATA IDENT CONTENT YEAR
 ##
-## Ends in an error in state: 281.
+## Ends in an error in state: 285.
 ##
 ## struct_scope_base -> DATA ident CONTENT . typ [ SCOPE END_CODE DEPENDS DECLARATION DATA CONDITION ]
 ##
@@ -199,7 +199,7 @@ expected the type of this struct data
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON DATA IDENT YEAR
 ##
-## Ends in an error in state: 280.
+## Ends in an error in state: 284.
 ##
 ## struct_scope_base -> DATA ident . CONTENT typ [ SCOPE END_CODE DEPENDS DECLARATION DATA CONDITION ]
 ##
@@ -211,7 +211,7 @@ expected the type of this struct data, introduced by the content keyword
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON DATA YEAR
 ##
-## Ends in an error in state: 279.
+## Ends in an error in state: 283.
 ##
 ## struct_scope_base -> DATA . ident CONTENT typ [ SCOPE END_CODE DEPENDS DECLARATION DATA CONDITION ]
 ##
@@ -223,7 +223,7 @@ expected the name of this struct data
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR COLON YEAR
 ##
-## Ends in an error in state: 278.
+## Ends in an error in state: 282.
 ##
 ## code_item -> DECLARATION STRUCT constructor COLON . list(struct_scope) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -235,7 +235,7 @@ expected struct data or condition
 
 source_file: BEGIN_CODE DECLARATION STRUCT CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 277.
+## Ends in an error in state: 281.
 ##
 ## code_item -> DECLARATION STRUCT constructor . COLON list(struct_scope) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -247,7 +247,7 @@ expected a colon
 
 source_file: BEGIN_CODE DECLARATION STRUCT YEAR
 ##
-## Ends in an error in state: 276.
+## Ends in an error in state: 280.
 ##
 ## code_item -> DECLARATION STRUCT . constructor COLON list(struct_scope) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -259,7 +259,7 @@ expected the struct name
 
 source_file: BEGIN_CODE DECLARATION YEAR
 ##
-## Ends in an error in state: 275.
+## Ends in an error in state: 279.
 ##
 ## code_item -> DECLARATION . STRUCT constructor COLON list(struct_scope) [ SCOPE END_CODE DECLARATION ]
 ## code_item -> DECLARATION . SCOPE constructor COLON nonempty_list(scope_decl_item) [ SCOPE END_CODE DECLARATION ]
@@ -273,7 +273,7 @@ expected the kind of the declaration (struct, scope or enum)
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION CARDINAL THEN
 ##
-## Ends in an error in state: 240.
+## Ends in an error in state: 244.
 ##
 ## nonempty_list(scope_item) -> scope_item . [ SCOPE END_CODE DECLARATION ]
 ## nonempty_list(scope_item) -> scope_item . nonempty_list(scope_item) [ SCOPE END_CODE DECLARATION ]
@@ -285,27 +285,27 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION CARDINAL THEN
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 78, spurious reduction of production small_expression -> CARDINAL
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 174, spurious reduction of production expression -> logical_expression
-## In state 234, spurious reduction of production assertion_base -> expression
-## In state 235, spurious reduction of production assertion -> option(condition_consequence) assertion_base
-## In state 239, spurious reduction of production scope_item -> ASSERTION assertion
+## In state 101, spurious reduction of production small_expression -> CARDINAL
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 173, spurious reduction of production expression -> logical_expression
+## In state 238, spurious reduction of production assertion_base -> expression
+## In state 239, spurious reduction of production assertion -> option(condition_consequence) assertion_base
+## In state 243, spurious reduction of production scope_item -> ASSERTION assertion
 ##
 
 expected a new scope use item
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION FIXED IDENT BY YEAR
 ##
-## Ends in an error in state: 231.
+## Ends in an error in state: 235.
 ##
 ## assertion -> FIXED qident BY . ident [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -317,7 +317,7 @@ expected the legislative text by which the value of the variable is fixed
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION FIXED IDENT WITH_V
 ##
-## Ends in an error in state: 230.
+## Ends in an error in state: 234.
 ##
 ## assertion -> FIXED qident . BY ident [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -328,15 +328,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION FIXED IDENT WITH_V
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 224, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
-## In state 216, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
+## In state 228, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
+## In state 220, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
 ##
 
 expected the legislative text by which the value of the variable is fixed
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION FIXED YEAR
 ##
-## Ends in an error in state: 229.
+## Ends in an error in state: 233.
 ##
 ## assertion -> FIXED . qident BY ident [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -349,9 +349,9 @@ expected the name of the variable that should be fixed
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION UNDER_CONDITION TRUE THEN
 ##
-## Ends in an error in state: 237.
+## Ends in an error in state: 241.
 ##
-## condition_consequence -> condition . CONSEQUENCE [ VERTICAL TRUE SUM STATE NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FILLED FALSE EXISTS DEFINED_AS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## condition_consequence -> condition . CONSEQUENCE [ VERTICAL TRUE SUM STATE OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FILLED FALSE EXISTS DEFINED_AS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## condition
@@ -360,24 +360,24 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION UNDER_CONDITION TRUE T
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 174, spurious reduction of production expression -> logical_expression
-## In state 228, spurious reduction of production condition -> UNDER_CONDITION expression
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 173, spurious reduction of production expression -> logical_expression
+## In state 232, spurious reduction of production condition -> UNDER_CONDITION expression
 ##
 
 expected a consequence for this definition under condition
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION UNDER_CONDITION YEAR
 ##
-## Ends in an error in state: 227.
+## Ends in an error in state: 231.
 ##
 ## condition -> UNDER_CONDITION . expression [ CONSEQUENCE ]
 ##
@@ -389,7 +389,7 @@ expected an expression for this condition
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION VARIES IDENT UNDER_CONDITION
 ##
-## Ends in an error in state: 217.
+## Ends in an error in state: 221.
 ##
 ## assertion -> VARIES qident . WITH_V base_expression option(variation_type) [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -400,15 +400,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION VARIES IDENT UNDER_CON
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 224, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
-## In state 216, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
+## In state 228, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
+## In state 220, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
 ##
 
 expected an indication about what this variable varies with
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION VARIES IDENT WITH_V TRUE XOR
 ##
-## Ends in an error in state: 219.
+## Ends in an error in state: 223.
 ##
 ## assertion -> VARIES qident WITH_V base_expression . option(variation_type) [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -419,15 +419,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION VARIES IDENT WITH_V TR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
 ##
 
 expected an indication about the variation sense of the variable, or a new scope item
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION VARIES IDENT WITH_V YEAR
 ##
-## Ends in an error in state: 218.
+## Ends in an error in state: 222.
 ##
 ## assertion -> VARIES qident WITH_V . base_expression option(variation_type) [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -439,7 +439,7 @@ the variable varies with an expression that was expected here
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION VARIES YEAR
 ##
-## Ends in an error in state: 215.
+## Ends in an error in state: 219.
 ##
 ## assertion -> VARIES . qident WITH_V base_expression option(variation_type) [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -451,7 +451,7 @@ expecting the name of the varying variable
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON ASSERTION YEAR
 ##
-## Ends in an error in state: 214.
+## Ends in an error in state: 218.
 ##
 ## scope_item -> ASSERTION . assertion [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -463,7 +463,7 @@ expected an expression that shoud be asserted during execution
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON DEFINITION IDENT DEFINED_AS YEAR
 ##
-## Ends in an error in state: 268.
+## Ends in an error in state: 272.
 ##
 ## definition -> option(label) option(exception_to) DEFINITION qident option(definition_parameters) option(state) option(condition_consequence) DEFINED_AS . expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -475,7 +475,7 @@ expected an expression for the definition
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON DEFINITION IDENT OF IDENT DECREASING
 ##
-## Ends in an error in state: 265.
+## Ends in an error in state: 269.
 ##
 ## definition -> option(label) option(exception_to) DEFINITION qident option(definition_parameters) . option(state) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -488,7 +488,7 @@ expected a expression for defining this function, introduced by the defined as k
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON DEFINITION IDENT WITH_V
 ##
-## Ends in an error in state: 264.
+## Ends in an error in state: 268.
 ##
 ## definition -> option(label) option(exception_to) DEFINITION qident . option(definition_parameters) option(state) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -499,15 +499,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON DEFINITION IDENT WITH_V
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 224, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
-## In state 216, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
+## In state 228, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
+## In state 220, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
 ##
 
 expected the defined as keyword to introduce the definition of this variable
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON DEFINITION YEAR
 ##
-## Ends in an error in state: 263.
+## Ends in an error in state: 267.
 ##
 ## definition -> option(label) option(exception_to) DEFINITION . qident option(definition_parameters) option(state) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -519,7 +519,7 @@ expected the name of the variable you want to define
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON EXCEPTION IDENT YEAR
 ##
-## Ends in an error in state: 246.
+## Ends in an error in state: 250.
 ##
 ## definition -> option(label) option(exception_to) . DEFINITION qident option(definition_parameters) option(state) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ## rule -> option(label) option(exception_to) . RULE rule_expr option(condition_consequence) option(state) rule_consequence [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
@@ -532,7 +532,7 @@ expected a rule or a definition after the exception declaration
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON EXCEPTION YEAR
 ##
-## Ends in an error in state: 243.
+## Ends in an error in state: 247.
 ##
 ## exception_to -> EXCEPTION . option(ident) [ RULE DEFINITION ]
 ##
@@ -544,7 +544,7 @@ expected the label to which the exception is referring back
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON LABEL IDENT DEFINED_AS
 ##
-## Ends in an error in state: 242.
+## Ends in an error in state: 246.
 ##
 ## definition -> option(label) . option(exception_to) DEFINITION qident option(definition_parameters) option(state) option(condition_consequence) DEFINED_AS expression [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ## rule -> option(label) . option(exception_to) RULE rule_expr option(condition_consequence) option(state) rule_consequence [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
@@ -557,7 +557,7 @@ expected a rule or a definition after the label declaration
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON LABEL YEAR
 ##
-## Ends in an error in state: 212.
+## Ends in an error in state: 216.
 ##
 ## label -> LABEL . ident [ RULE EXCEPTION DEFINITION ]
 ##
@@ -569,7 +569,7 @@ expected the name of the label
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT DOT YEAR
 ##
-## Ends in an error in state: 225.
+## Ends in an error in state: 229.
 ##
 ## separated_nonempty_list(DOT,ident) -> ident DOT . separated_nonempty_list(DOT,ident) [ WITH_V UNDER_CONDITION STATE OF NOT FILLED DEFINED_AS BY ]
 ##
@@ -581,7 +581,7 @@ expected a struct field or a sub-scope context item after the dot
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT NOT FALSE
 ##
-## Ends in an error in state: 256.
+## Ends in an error in state: 260.
 ##
 ## rule_consequence -> option(NOT) . FILLED [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -593,7 +593,7 @@ expected the filled keyword the this rule
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT OF IDENT YEAR
 ##
-## Ends in an error in state: 248.
+## Ends in an error in state: 252.
 ##
 ## rule -> option(label) option(exception_to) RULE rule_expr . option(condition_consequence) option(state) rule_consequence [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -605,7 +605,7 @@ expected the expression of the rule
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT OF YEAR
 ##
-## Ends in an error in state: 259.
+## Ends in an error in state: 263.
 ##
 ## definition_parameters -> OF . ident [ UNDER_CONDITION STATE NOT FILLED DEFINED_AS ]
 ##
@@ -618,7 +618,7 @@ expected the name of the parameter for this dependent variable
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT WITH_V
 ##
-## Ends in an error in state: 258.
+## Ends in an error in state: 262.
 ##
 ## rule_expr -> qident . option(definition_parameters) [ UNDER_CONDITION STATE NOT FILLED ]
 ##
@@ -629,15 +629,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT WITH_V
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 224, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
-## In state 216, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
+## In state 228, spurious reduction of production separated_nonempty_list(DOT,ident) -> ident
+## In state 220, spurious reduction of production qident -> separated_nonempty_list(DOT,ident)
 ##
 
 expected a condition or a consequence for this rule
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE IDENT YEAR
 ##
-## Ends in an error in state: 224.
+## Ends in an error in state: 228.
 ##
 ## separated_nonempty_list(DOT,ident) -> ident . [ WITH_V UNDER_CONDITION STATE OF NOT FILLED DEFINED_AS BY ]
 ## separated_nonempty_list(DOT,ident) -> ident . DOT separated_nonempty_list(DOT,ident) [ WITH_V UNDER_CONDITION STATE OF NOT FILLED DEFINED_AS BY ]
@@ -650,7 +650,7 @@ expected a condition or a consequence for this rule, or the rest of the variable
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON RULE YEAR
 ##
-## Ends in an error in state: 247.
+## Ends in an error in state: 251.
 ##
 ## rule -> option(label) option(exception_to) RULE . rule_expr option(condition_consequence) option(state) rule_consequence [ SCOPE RULE LABEL EXCEPTION END_CODE DEFINITION DECLARATION ASSERTION ]
 ##
@@ -662,7 +662,7 @@ expected the name of the variable subject to the rule
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR COLON YEAR
 ##
-## Ends in an error in state: 211.
+## Ends in an error in state: 215.
 ##
 ## code_item -> SCOPE constructor option(scope_use_condition) COLON . nonempty_list(scope_item) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -674,7 +674,7 @@ expected a scope use item: a rule, definition or assertion
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CARDINAL YEAR
 ##
-## Ends in an error in state: 78.
+## Ends in an error in state: 101.
 ##
 ## aggregate_func -> CARDINAL . [ FOR ]
 ## small_expression -> CARDINAL . [ XOR WITH THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
@@ -687,7 +687,7 @@ expected the keyword following cardinal to compute the number of elements in a s
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR CONTENT TRUE YEAR
 ##
-## Ends in an error in state: 109.
+## Ends in an error in state: 93.
 ##
 ## enum_inject_content -> CONTENT small_expression . [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ## small_expression -> small_expression . DOT option(terminated(constructor,DOT)) ident [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
@@ -700,7 +700,7 @@ the expression for the content of the enum case is already well-formed, expected
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR CONTENT YEAR
 ##
-## Ends in an error in state: 108.
+## Ends in an error in state: 92.
 ##
 ## enum_inject_content -> CONTENT . small_expression [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -712,7 +712,7 @@ expected an expression for the content of this enum case
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR DOT CONSTRUCTOR ALL
 ##
-## Ends in an error in state: 107.
+## Ends in an error in state: 91.
 ##
 ## struct_or_enum_inject -> constructor option(preceded(DOT,constructor)) . option(enum_inject_content) [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -724,7 +724,7 @@ expected the rest of the path, or the content of the enum constructor
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR DOT YEAR
 ##
-## Ends in an error in state: 91.
+## Ends in an error in state: 88.
 ##
 ## option(preceded(DOT,constructor)) -> DOT . constructor [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTENT CONTAINS CONSTRUCTOR CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -737,7 +737,7 @@ expected the rest of the path after the dot
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT COLON CARDINAL THEN
 ##
-## Ends in an error in state: 74.
+## Ends in an error in state: 84.
 ##
 ## nonempty_list(preceded(ALT,struct_content_field)) -> ALT struct_content_field . [ RBRACKET ]
 ## nonempty_list(preceded(ALT,struct_content_field)) -> ALT struct_content_field . nonempty_list(preceded(ALT,struct_content_field)) [ RBRACKET ]
@@ -749,24 +749,24 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET A
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 78, spurious reduction of production small_expression -> CARDINAL
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 153, spurious reduction of production struct_content_field -> ident COLON logical_expression
+## In state 101, spurious reduction of production small_expression -> CARDINAL
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 207, spurious reduction of production struct_content_field -> ident COLON logical_expression
 ##
 
 expected another structure field or the closing bracket
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT COLON YEAR
 ##
-## Ends in an error in state: 77.
+## Ends in an error in state: 35.
 ##
 ## struct_content_field -> ident COLON . logical_expression [ RBRACKET ALT ]
 ##
@@ -778,7 +778,7 @@ expected the expression for this struct field
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT IDENT YEAR
 ##
-## Ends in an error in state: 76.
+## Ends in an error in state: 34.
 ##
 ## struct_content_field -> ident . COLON logical_expression [ RBRACKET ALT ]
 ##
@@ -790,7 +790,7 @@ expected a colon
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET ALT YEAR
 ##
-## Ends in an error in state: 73.
+## Ends in an error in state: 83.
 ##
 ## nonempty_list(preceded(ALT,struct_content_field)) -> ALT . struct_content_field [ RBRACKET ]
 ## nonempty_list(preceded(ALT,struct_content_field)) -> ALT . struct_content_field nonempty_list(preceded(ALT,struct_content_field)) [ RBRACKET ]
@@ -803,7 +803,7 @@ expected the name of the structure field
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR LBRACKET YEAR
 ##
-## Ends in an error in state: 72.
+## Ends in an error in state: 82.
 ##
 ## struct_inject_content -> LBRACKET . nonempty_list(preceded(ALT,struct_content_field)) RBRACKET [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -815,11 +815,10 @@ expected structure fields introduced by --
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 98.
+## Ends in an error in state: 81.
 ##
-## base_expression -> constructor . OF LBRACKET list(preceded(ALT,struct_content_field)) RBRACKET [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
-## struct_or_enum_inject -> constructor . option(preceded(DOT,constructor)) option(enum_inject_content) [ XOR WITH THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
-## struct_or_enum_inject -> constructor . struct_inject_content [ XOR WITH THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
+## struct_or_enum_inject -> constructor . option(preceded(DOT,constructor)) option(enum_inject_content) [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
+## struct_or_enum_inject -> constructor . struct_inject_content [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
 ## The known suffix of the stack is as follows:
 ## constructor
@@ -829,7 +828,7 @@ expected a payload for the enum case constructor, or the rest of the expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT MAXIMUM TEXT INIT YEAR
 ##
-## Ends in an error in state: 158.
+## Ends in an error in state: 99.
 ##
 ## aggregate_func -> CONTENT MAXIMUM option(typ_base) INIT . primitive_expression [ FOR ]
 ##
@@ -841,7 +840,7 @@ expected the initial expression for the maximum
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT MAXIMUM TEXT YEAR
 ##
-## Ends in an error in state: 157.
+## Ends in an error in state: 98.
 ##
 ## aggregate_func -> CONTENT MAXIMUM option(typ_base) . INIT primitive_expression [ FOR ]
 ##
@@ -853,7 +852,7 @@ expected the "initial" keyword introducing the initial expression for the maximu
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT MAXIMUM YEAR
 ##
-## Ends in an error in state: 156.
+## Ends in an error in state: 97.
 ##
 ## aggregate_func -> CONTENT MAXIMUM . option(typ_base) INIT primitive_expression [ FOR ]
 ##
@@ -865,7 +864,7 @@ expected the type of the elements compared to get the maximum
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT MINIMUM TEXT INIT YEAR
 ##
-## Ends in an error in state: 61.
+## Ends in an error in state: 71.
 ##
 ## aggregate_func -> CONTENT MINIMUM option(typ_base) INIT . primitive_expression [ FOR ]
 ##
@@ -877,7 +876,7 @@ expected the initial expression for the minimum
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT MINIMUM TEXT YEAR
 ##
-## Ends in an error in state: 60.
+## Ends in an error in state: 70.
 ##
 ## aggregate_func -> CONTENT MINIMUM option(typ_base) . INIT primitive_expression [ FOR ]
 ##
@@ -889,7 +888,7 @@ expected the "initial" keyword introducing the initial expression for the minimu
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT MINIMUM YEAR
 ##
-## Ends in an error in state: 59.
+## Ends in an error in state: 69.
 ##
 ## aggregate_func -> CONTENT MINIMUM . option(typ_base) INIT primitive_expression [ FOR ]
 ##
@@ -901,7 +900,7 @@ expected the type of the elements compared to get the minimum
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION CONTENT YEAR
 ##
-## Ends in an error in state: 58.
+## Ends in an error in state: 68.
 ##
 ## aggregate_func -> CONTENT . MAXIMUM option(typ_base) INIT primitive_expression [ FOR ]
 ## aggregate_func -> CONTENT . MINIMUM option(typ_base) INIT primitive_expression [ FOR ]
@@ -914,7 +913,7 @@ this is the start of an arg-maximum or arg-minimum expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION EXISTS IDENT IN CARDINAL SUCH THAT YEAR
 ##
-## Ends in an error in state: 182.
+## Ends in an error in state: 181.
 ##
 ## expression -> exists_prefix . expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -926,9 +925,9 @@ expected an expression for the existential test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION EXISTS IDENT IN TRUE SUCH YEAR
 ##
-## Ends in an error in state: 188.
+## Ends in an error in state: 187.
 ##
-## exists_prefix -> exists_marked ident IN primitive_expression SUCH . THAT [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## exists_prefix -> exists_marked ident IN primitive_expression SUCH . THAT [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## exists_marked ident IN primitive_expression SUCH
@@ -938,9 +937,9 @@ expected a keyword to complete the "such that" construction
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION EXISTS IDENT IN YEAR
 ##
-## Ends in an error in state: 186.
+## Ends in an error in state: 185.
 ##
-## exists_prefix -> exists_marked ident IN . primitive_expression SUCH THAT [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## exists_prefix -> exists_marked ident IN . primitive_expression SUCH THAT [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## exists_marked ident IN
@@ -950,9 +949,9 @@ expected an expression that designates the set subject to the existential test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION EXISTS IDENT YEAR
 ##
-## Ends in an error in state: 185.
+## Ends in an error in state: 184.
 ##
-## exists_prefix -> exists_marked ident . IN primitive_expression SUCH THAT [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## exists_prefix -> exists_marked ident . IN primitive_expression SUCH THAT [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## exists_marked ident
@@ -962,9 +961,9 @@ expected the "in" keyword to continue this existential test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION EXISTS YEAR
 ##
-## Ends in an error in state: 184.
+## Ends in an error in state: 183.
 ##
-## exists_prefix -> exists_marked . ident IN primitive_expression SUCH THAT [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## exists_prefix -> exists_marked . ident IN primitive_expression SUCH THAT [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## exists_marked
@@ -974,7 +973,7 @@ expected an identifier that will designate the existential witness for the test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION FOR ALL IDENT IN CARDINAL WE_HAVE YEAR
 ##
-## Ends in an error in state: 175.
+## Ends in an error in state: 174.
 ##
 ## expression -> forall_prefix . expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -986,9 +985,9 @@ expected an expression for the universal test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION FOR ALL IDENT IN YEAR
 ##
-## Ends in an error in state: 178.
+## Ends in an error in state: 177.
 ##
-## forall_prefix -> for_all_marked ident IN . primitive_expression WE_HAVE [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## forall_prefix -> for_all_marked ident IN . primitive_expression WE_HAVE [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## for_all_marked ident IN
@@ -998,9 +997,9 @@ expected the expression designating the set on which to perform the universal te
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION FOR ALL IDENT YEAR
 ##
-## Ends in an error in state: 177.
+## Ends in an error in state: 176.
 ##
-## forall_prefix -> for_all_marked ident . IN primitive_expression WE_HAVE [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## forall_prefix -> for_all_marked ident . IN primitive_expression WE_HAVE [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## for_all_marked ident
@@ -1010,9 +1009,9 @@ expected the "in" keyword for the rest of the universal test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION FOR ALL YEAR
 ##
-## Ends in an error in state: 176.
+## Ends in an error in state: 175.
 ##
-## forall_prefix -> for_all_marked . ident IN primitive_expression WE_HAVE [ VERTICAL TRUE SUM NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
+## forall_prefix -> for_all_marked . ident IN primitive_expression WE_HAVE [ VERTICAL TRUE SUM OUTPUT NOT MONEY_AMOUNT MINUS MINIMUM MAXIMUM MATCH MAP LSQUARE LPAREN LET INT_LITERAL IF IDENT FOR FILTER FALSE EXISTS DECIMAL_LITERAL CONTENT CONSTRUCTOR CARDINAL ]
 ##
 ## The known suffix of the stack is as follows:
 ## for_all_marked
@@ -1022,7 +1021,7 @@ expected an identifier for the bound variable of the universal test
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION FOR YEAR
 ##
-## Ends in an error in state: 171.
+## Ends in an error in state: 170.
 ##
 ## for_all_marked -> FOR . ALL [ IDENT ]
 ##
@@ -1034,7 +1033,7 @@ expected the "all" keyword to mean the "for all" construction of the universal t
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION IF TRUE SEMICOLON
 ##
-## Ends in an error in state: 190.
+## Ends in an error in state: 189.
 ##
 ## expression -> IF expression . THEN expression ELSE expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -1045,16 +1044,16 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION IF TRUE SEMICOLON
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 174, spurious reduction of production expression -> logical_expression
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 173, spurious reduction of production expression -> logical_expression
 ##
 
 expected the "then" keyword as the conditional expression is complete
@@ -1064,7 +1063,7 @@ expected the "then" keyword as the conditional expression is complete
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION IF YEAR
 ##
-## Ends in an error in state: 170.
+## Ends in an error in state: 169.
 ##
 ## expression -> IF . expression THEN expression ELSE expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -1076,7 +1075,7 @@ expected an expression for the test of the conditional
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION INT_LITERAL WITH_V
 ##
-## Ends in an error in state: 63.
+## Ends in an error in state: 73.
 ##
 ## literal -> num_literal . option(unit_literal) [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1088,7 +1087,7 @@ expected a unit for this literal, or a valid operator to complete the expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION LPAREN TRUE THEN
 ##
-## Ends in an error in state: 198.
+## Ends in an error in state: 197.
 ##
 ## atomic_expression -> LPAREN expression . RPAREN [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1099,23 +1098,23 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION LPAREN TRUE THEN
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 174, spurious reduction of production expression -> logical_expression
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 173, spurious reduction of production expression -> logical_expression
 ##
 
 unmatched parenthesis that should have been closed by here
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION LPAREN YEAR
 ##
-## Ends in an error in state: 36.
+## Ends in an error in state: 47.
 ##
 ## atomic_expression -> LPAREN . expression RPAREN [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1128,7 +1127,7 @@ expected an expression inside the parenthesis
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION LSQUARE TRUE THEN
 ##
-## Ends in an error in state: 204.
+## Ends in an error in state: 203.
 ##
 ## separated_nonempty_list(SEMICOLON,expression) -> expression . [ RSQUARE ]
 ## separated_nonempty_list(SEMICOLON,expression) -> expression . SEMICOLON separated_nonempty_list(SEMICOLON,expression) [ RSQUARE ]
@@ -1140,23 +1139,23 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION LSQUARE TRUE THEN
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 174, spurious reduction of production expression -> logical_expression
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 173, spurious reduction of production expression -> logical_expression
 ##
 
 expected a semicolon or a right square bracket after the collection element
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION LSQUARE YEAR
 ##
-## Ends in an error in state: 32.
+## Ends in an error in state: 43.
 ##
 ## small_expression -> LSQUARE . loption(separated_nonempty_list(SEMICOLON,expression)) RSQUARE [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1168,7 +1167,7 @@ expected a collection element
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAP FOR IDENT IN TRUE OF YEAR
 ##
-## Ends in an error in state: 119.
+## Ends in an error in state: 125.
 ##
 ## aggregate -> aggregate_func FOR ident IN primitive_expression OF . base_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1180,7 +1179,7 @@ expected an expression for the map predicate
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAP FOR IDENT IN TRUE XOR
 ##
-## Ends in an error in state: 44.
+## Ends in an error in state: 55.
 ##
 ## primitive_expression -> small_expression . [ WITH WE_HAVE SUCH OF FOR ]
 ## small_expression -> small_expression . DOT option(terminated(constructor,DOT)) ident [ WITH WE_HAVE SUCH OF FOR DOT ]
@@ -1193,7 +1192,7 @@ expected the "of" keyword to introduce the map predicate
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAP FOR IDENT IN YEAR
 ##
-## Ends in an error in state: 117.
+## Ends in an error in state: 123.
 ##
 ## aggregate -> aggregate_func FOR ident IN . primitive_expression OF base_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1205,7 +1204,7 @@ expected the collection argument to map
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAP FOR IDENT YEAR
 ##
-## Ends in an error in state: 116.
+## Ends in an error in state: 122.
 ##
 ## aggregate -> aggregate_func FOR ident . IN primitive_expression OF base_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1217,7 +1216,7 @@ expected the "in" keyword to introduce the collection argument to map
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAP FOR YEAR
 ##
-## Ends in an error in state: 115.
+## Ends in an error in state: 121.
 ##
 ## aggregate -> aggregate_func FOR . ident IN primitive_expression OF base_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1229,7 +1228,7 @@ expected the identifier for the map predicate
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAP YEAR
 ##
-## Ends in an error in state: 114.
+## Ends in an error in state: 120.
 ##
 ## aggregate -> aggregate_func . FOR ident IN primitive_expression OF base_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1241,7 +1240,7 @@ expected the "for" keyword to introduce the identifier for the map predicate
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH ALT CONSTRUCTOR COLON CARDINAL RBRACKET
 ##
-## Ends in an error in state: 161.
+## Ends in an error in state: 160.
 ##
 ## match_arms -> ALT match_arm . match_arms [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -1252,24 +1251,24 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH ALT CO
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 78, spurious reduction of production small_expression -> CARDINAL
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 165, spurious reduction of production match_arm -> constructor_binding COLON logical_expression
+## In state 101, spurious reduction of production small_expression -> CARDINAL
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 164, spurious reduction of production match_arm -> constructor_binding COLON logical_expression
 ##
 
 expected the "with pattern" keyword to complete the pattern matching expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH ALT CONSTRUCTOR COLON YEAR
 ##
-## Ends in an error in state: 164.
+## Ends in an error in state: 163.
 ##
 ## match_arm -> constructor_binding COLON . logical_expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ALT ]
 ##
@@ -1281,7 +1280,7 @@ expected a correct expression for this match arm
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH ALT CONSTRUCTOR XOR
 ##
-## Ends in an error in state: 163.
+## Ends in an error in state: 162.
 ##
 ## match_arm -> constructor_binding . COLON logical_expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ALT ]
 ##
@@ -1292,17 +1291,17 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH ALT CO
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 90, spurious reduction of production option(preceded(DOT,constructor)) ->
-## In state 93, spurious reduction of production maybe_qualified_constructor -> constructor option(preceded(DOT,constructor))
-## In state 86, spurious reduction of production optional_binding ->
-## In state 95, spurious reduction of production constructor_binding -> maybe_qualified_constructor optional_binding
+## In state 113, spurious reduction of production option(preceded(DOT,constructor)) ->
+## In state 114, spurious reduction of production maybe_qualified_constructor -> constructor option(preceded(DOT,constructor))
+## In state 109, spurious reduction of production optional_binding ->
+## In state 116, spurious reduction of production constructor_binding -> maybe_qualified_constructor optional_binding
 ##
 
 expected a constructor payload binding or a colon
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH ALT YEAR
 ##
-## Ends in an error in state: 53.
+## Ends in an error in state: 63.
 ##
 ## match_arms -> ALT . match_arm match_arms [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -1314,7 +1313,7 @@ expected the name of the constructor for the enum case in the pattern matching
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH TRUE WITH YEAR
 ##
-## Ends in an error in state: 52.
+## Ends in an error in state: 62.
 ##
 ## expression -> MATCH primitive_expression WITH . match_arms [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -1326,7 +1325,7 @@ expected a pattern matching case
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MATCH YEAR
 ##
-## Ends in an error in state: 37.
+## Ends in an error in state: 48.
 ##
 ## expression -> MATCH . primitive_expression WITH match_arms [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION ]
 ##
@@ -1338,7 +1337,7 @@ expected an expression to match with
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAXIMUM TEXT INIT YEAR
 ##
-## Ends in an error in state: 35.
+## Ends in an error in state: 46.
 ##
 ## aggregate_func -> MAXIMUM option(typ_base) INIT . primitive_expression [ FOR ]
 ##
@@ -1350,7 +1349,7 @@ expected the maximum initial expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAXIMUM TEXT YEAR
 ##
-## Ends in an error in state: 34.
+## Ends in an error in state: 45.
 ##
 ## aggregate_func -> MAXIMUM option(typ_base) . INIT primitive_expression [ FOR ]
 ##
@@ -1362,7 +1361,7 @@ expected the "initial" keyword to introduce the maximum initial expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MAXIMUM YEAR
 ##
-## Ends in an error in state: 33.
+## Ends in an error in state: 44.
 ##
 ## aggregate_func -> MAXIMUM . option(typ_base) INIT primitive_expression [ FOR ]
 ##
@@ -1374,7 +1373,7 @@ expected the type of the elements compared for the maximum
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MINIMUM TEXT INIT YEAR
 ##
-## Ends in an error in state: 31.
+## Ends in an error in state: 42.
 ##
 ## aggregate_func -> MINIMUM option(typ_base) INIT . primitive_expression [ FOR ]
 ##
@@ -1386,7 +1385,7 @@ expected the minimum initial expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MINIMUM TEXT YEAR
 ##
-## Ends in an error in state: 30.
+## Ends in an error in state: 41.
 ##
 ## aggregate_func -> MINIMUM option(typ_base) . INIT primitive_expression [ FOR ]
 ##
@@ -1398,7 +1397,7 @@ expected the "initial" keyword to introduce the minimum initial expression
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION MINIMUM YEAR
 ##
-## Ends in an error in state: 28.
+## Ends in an error in state: 39.
 ##
 ## aggregate_func -> MINIMUM . option(typ_base) INIT primitive_expression [ FOR ]
 ##
@@ -1422,7 +1421,7 @@ expected the "for" keyword to spell the aggregation
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE ASSERTION
 ##
-## Ends in an error in state: 210.
+## Ends in an error in state: 214.
 ##
 ## code_item -> SCOPE constructor option(scope_use_condition) . COLON nonempty_list(scope_item) [ SCOPE END_CODE DECLARATION ]
 ##
@@ -1433,25 +1432,25 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE ASSERTION
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
-## In state 141, spurious reduction of production sum_expression -> mult_expression
-## In state 124, spurious reduction of production compare_expression -> sum_expression
-## In state 152, spurious reduction of production logical_atom -> compare_expression
-## In state 147, spurious reduction of production logical_or_expression -> logical_atom
-## In state 143, spurious reduction of production logical_expression -> logical_or_expression
-## In state 174, spurious reduction of production expression -> logical_expression
-## In state 208, spurious reduction of production scope_use_condition -> UNDER_CONDITION expression
-## In state 209, spurious reduction of production option(scope_use_condition) -> scope_use_condition
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
+## In state 147, spurious reduction of production sum_expression -> mult_expression
+## In state 130, spurious reduction of production compare_expression -> sum_expression
+## In state 158, spurious reduction of production logical_atom -> compare_expression
+## In state 153, spurious reduction of production logical_or_expression -> logical_atom
+## In state 149, spurious reduction of production logical_expression -> logical_or_expression
+## In state 173, spurious reduction of production expression -> logical_expression
+## In state 212, spurious reduction of production scope_use_condition -> UNDER_CONDITION expression
+## In state 213, spurious reduction of production option(scope_use_condition) -> scope_use_condition
 ##
 
 expected a colon after the scope use precondition
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE DOT CONSTRUCTOR DOT YEAR
 ##
-## Ends in an error in state: 46.
+## Ends in an error in state: 57.
 ##
 ## small_expression -> small_expression DOT option(terminated(constructor,DOT)) . ident [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1463,7 +1462,7 @@ expected the rest of the path after the dot
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE DOT CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 49.
+## Ends in an error in state: 59.
 ##
 ## option(terminated(constructor,DOT)) -> constructor . DOT [ IDENT ]
 ##
@@ -1475,7 +1474,7 @@ expected the rest of the path after a dot
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE DOT YEAR
 ##
-## Ends in an error in state: 45.
+## Ends in an error in state: 56.
 ##
 ## small_expression -> small_expression DOT . option(terminated(constructor,DOT)) ident [ XOR WITH WE_HAVE THEN SUCH SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER FOR EXCEPTION EQUAL END_CODE ELSE DOT DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1488,7 +1487,7 @@ expected the name of the struct field of the expression before
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE INCREASING
 ##
-## Ends in an error in state: 141.
+## Ends in an error in state: 147.
 ##
 ## mult_expression -> mult_expression . mult_op unop_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ## sum_expression -> mult_expression . [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MINUS LESSER_EQUAL LESSER LABEL IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
@@ -1500,17 +1499,17 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE INCREASING
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 82, spurious reduction of production primitive_expression -> small_expression
-## In state 84, spurious reduction of production base_expression -> primitive_expression
-## In state 123, spurious reduction of production unop_expression -> base_expression
-## In state 79, spurious reduction of production mult_expression -> unop_expression
+## In state 105, spurious reduction of production primitive_expression -> small_expression
+## In state 107, spurious reduction of production base_expression -> primitive_expression
+## In state 129, spurious reduction of production unop_expression -> base_expression
+## In state 102, spurious reduction of production mult_expression -> unop_expression
 ##
 
 expected an operator to compose the expression on the left
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH CONSTRUCTOR CONSTRUCTOR
 ##
-## Ends in an error in state: 86.
+## Ends in an error in state: 109.
 ##
 ## constructor_binding -> maybe_qualified_constructor . optional_binding [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1521,15 +1520,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH CONSTRUCTOR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 90, spurious reduction of production option(preceded(DOT,constructor)) ->
-## In state 93, spurious reduction of production maybe_qualified_constructor -> constructor option(preceded(DOT,constructor))
+## In state 113, spurious reduction of production option(preceded(DOT,constructor)) ->
+## In state 114, spurious reduction of production maybe_qualified_constructor -> constructor option(preceded(DOT,constructor))
 ##
 
 a enum constructor pattern should be followed by a payload
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH CONSTRUCTOR OF CONSTRUCTOR XOR
 ##
-## Ends in an error in state: 88.
+## Ends in an error in state: 111.
 ##
 ## optional_binding -> OF maybe_qualified_constructor . constructor_binding [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1540,15 +1539,15 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH CONSTRUCTOR
 ## This implies that, although the LR(1) items shown above provide an
 ## accurate view of the past (what has been recognized so far), they
 ## may provide an INCOMPLETE view of the future (what was expected next).
-## In state 90, spurious reduction of production option(preceded(DOT,constructor)) ->
-## In state 93, spurious reduction of production maybe_qualified_constructor -> constructor option(preceded(DOT,constructor))
+## In state 113, spurious reduction of production option(preceded(DOT,constructor)) ->
+## In state 114, spurious reduction of production maybe_qualified_constructor -> constructor option(preceded(DOT,constructor))
 ##
 
 unexpected expression following a function application with an enum constructor name
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH CONSTRUCTOR OF YEAR
 ##
-## Ends in an error in state: 87.
+## Ends in an error in state: 110.
 ##
 ## optional_binding -> OF . ident [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ## optional_binding -> OF . maybe_qualified_constructor constructor_binding [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
@@ -1561,7 +1560,7 @@ expecting an expression to stand in as the function argument
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH CONSTRUCTOR YEAR
 ##
-## Ends in an error in state: 90.
+## Ends in an error in state: 113.
 ##
 ## maybe_qualified_constructor -> constructor . option(preceded(DOT,constructor)) [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR OF NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSTRUCTOR CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1573,7 +1572,7 @@ the expression before ended, what follows next should be an operator or the rest
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH YEAR
 ##
-## Ends in an error in state: 85.
+## Ends in an error in state: 108.
 ##
 ## base_expression -> primitive_expression WITH . constructor_binding [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1585,7 +1584,7 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE WITH YEAR
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE XOR YEAR
 ##
-## Ends in an error in state: 150.
+## Ends in an error in state: 156.
 ##
 ## logical_or_expression -> logical_atom logical_or_op . logical_or_expression [ THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET LABEL IN EXCEPTION END_CODE ELSE DEFINITION DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ##
@@ -1597,7 +1596,7 @@ source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE XOR YEAR
 
 source_file: BEGIN_CODE SCOPE CONSTRUCTOR UNDER_CONDITION TRUE YEAR
 ##
-## Ends in an error in state: 82.
+## Ends in an error in state: 105.
 ##
 ## base_expression -> small_expression . OF base_expression [ XOR THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONSEQUENCE COLON ASSERTION AND ALT ]
 ## primitive_expression -> small_expression . [ XOR WITH THEN SEMICOLON SCOPE RULE RSQUARE RPAREN RBRACKET PLUSPLUS PLUS OR NOT_EQUAL MULT MINUS LESSER_EQUAL LESSER LABEL INCREASING IN GREATER_EQUAL GREATER EXCEPTION EQUAL END_CODE ELSE DIV DEFINITION DECREASING DECLARATION CONTAINS CONSEQUENCE COLON ASSERTION AND ALT ]
@@ -1664,7 +1663,7 @@ expected the name of the scope being used
 
 source_file: BEGIN_CODE YEAR
 ##
-## Ends in an error in state: 353.
+## Ends in an error in state: 357.
 ##
 ## source_file_item -> BEGIN_CODE . code END_CODE [ LAW_TEXT LAW_HEADING EOF BEGIN_METADATA BEGIN_DIRECTIVE BEGIN_CODE ]
 ##
diff --git a/compiler/surface/parser.mly b/compiler/surface/parser.mly
index d9029740..745c9b32 100644
--- a/compiler/surface/parser.mly
+++ b/compiler/surface/parser.mly
@@ -180,15 +180,19 @@ aggregate:
   (CollectionOp (func, i, e1, e2), Pos.from_lpos $sloc)
 }
 
+scope_call_args:
+| WITH_V LBRACKET fields = list(preceded (ALT, struct_content_field)) RBRACKET {
+  fields
+}
+
 base_expression:
 | e = primitive_expression { e }
 | ag = aggregate { ag }
 | e1 = small_expression OF e2 = base_expression {
   (FunCall (e1, e2), Pos.from_lpos $sloc)
 }
-| c = constructor OF
-  LBRACKET fields = list(preceded (ALT, struct_content_field)) RBRACKET {
-  (* empty list is allowed *)
+| OUTPUT OF c = constructor fields = option(scope_call_args) {
+  let fields = Option.value ~default:[] fields in
   (ScopeCall (c, fields), Pos.from_lpos $sloc)
 }
 | e = primitive_expression WITH c = constructor_binding {
diff --git a/examples/aides_logement/code_construction_reglementaire.catala_fr b/examples/aides_logement/code_construction_reglementaire.catala_fr
index d347ce8e..0ddfca06 100644
--- a/examples/aides_logement/code_construction_reglementaire.catala_fr
+++ b/examples/aides_logement/code_construction_reglementaire.catala_fr
@@ -1426,7 +1426,7 @@ champ d'application CalculAidePersonnaliséeLogement:
     selon catégorie_calcul_apl sous forme
     -- Location de location:
       (soit traitement_formule égal à
-        CalculAidePersonnaliséeLogementLocatif de {
+        résultat de CalculAidePersonnaliséeLogementLocatif avec {
           -- ressources_ménage_arrondies: ressources_ménage
           -- nombre_personnes_à_charge: nombre_personnes_à_charge
           -- zone: zone
@@ -1457,7 +1457,7 @@ champ d'application CalculAidePersonnaliséeLogement:
       })
     -- LogementFoyer de logement_foyer_:
       (soit traitement_formule égal à
-        CalculAidePersonnaliséeLogementFoyer de {
+        résultat de CalculAidePersonnaliséeLogementFoyer avec {
           -- ressources_ménage_arrondies: ressources_ménage
           -- nombre_personnes_à_charge: nombre_personnes_à_charge
           -- zone: zone
@@ -1477,7 +1477,7 @@ champ d'application CalculAidePersonnaliséeLogement:
       })
     -- AccessionPropriété de propriétaire:
       (soit traitement_formule égal à
-         CalculAidePersonnaliséeLogementAccessionPropriété de {
+         résultat de CalculAidePersonnaliséeLogementAccessionPropriété avec {
            -- ressources_ménage_arrondies: ressources_ménage
            -- nombre_personnes_à_charge: nombre_personnes_à_charge
            -- zone: zone
@@ -1510,7 +1510,7 @@ champ d'application CalculAllocationLogement:
     selon mode_occupation sous forme
     -- Locataire de location:
       (soit traitement_formule égal à
-        CalculAllocationLogementLocatif de {
+        résultat de CalculAllocationLogementLocatif avec {
           -- ressources_ménage_arrondies: ressources_ménage
           -- nombre_personnes_à_charge: nombre_personnes_à_charge
           -- zone: zone
@@ -1542,7 +1542,7 @@ champ d'application CalculAllocationLogement:
       })
     -- SousLocataire de location: # Identique à Locataire
       (soit traitement_formule égal à
-        CalculAllocationLogementLocatif de {
+        résultat de CalculAllocationLogementLocatif avec {
           -- ressources_ménage_arrondies: ressources_ménage
           -- nombre_personnes_à_charge: nombre_personnes_à_charge
           -- zone: zone
@@ -1574,7 +1574,7 @@ champ d'application CalculAllocationLogement:
       })
     -- RésidentLogementFoyer de logement_foyer_:
       (soit traitement_formule égal à
-        CalculAllocationLogementFoyer de {
+        résultat de CalculAllocationLogementFoyer avec {
           -- ressources_ménage_arrondies: ressources_ménage
           -- nombre_personnes_à_charge: nombre_personnes_à_charge
           -- zone: zone
@@ -1595,7 +1595,7 @@ champ d'application CalculAllocationLogement:
       })
     -- AccessionPropriétéLocalUsageExclusifHabitation de propriétaire:
       (soit traitement_formule égal à
-         CalculAllocationLogementAccessionPropriété de {
+         résultat de CalculAllocationLogementAccessionPropriété avec {
            -- ressources_ménage_arrondies: ressources_ménage
            -- nombre_personnes_à_charge: nombre_personnes_à_charge
            -- zone: zone
@@ -1622,7 +1622,7 @@ champ d'application CalculAllocationLogement:
     -- LocationAccession de propriétaire:
       # Identique à AccessionPropriétéLocalUsageExclusifHabitation
       (soit traitement_formule égal à
-         CalculAllocationLogementAccessionPropriété de {
+         résultat de CalculAllocationLogementAccessionPropriété avec {
            -- ressources_ménage_arrondies: ressources_ménage
            -- nombre_personnes_à_charge: nombre_personnes_à_charge
            -- zone: zone
diff --git a/examples/tutorial_en/tutorial_en.catala_en b/examples/tutorial_en/tutorial_en.catala_en
index 784c4d2d..97cc6862 100644
--- a/examples/tutorial_en/tutorial_en.catala_en
+++ b/examples/tutorial_en/tutorial_en.catala_en
@@ -588,7 +588,7 @@ scope Test5:
   }
   definition income_tax equals
     if normal_income_tax_computation_applies then
-      (NewIncomeTaxComputationFixed of { -- individual: individual })
+      (output of NewIncomeTaxComputationFixed with { -- individual: individual })
       .income_tax
     else $0 # Insert some other modes of computation here
 ```
diff --git a/french_law/ocaml/law_source/aides_logement.ml b/french_law/ocaml/law_source/aides_logement.ml
index 7001bf38..09a6e7e8 100644
--- a/french_law/ocaml/law_source/aides_logement.ml
+++ b/french_law/ocaml/law_source/aides_logement.ml
@@ -2139,7 +2139,7 @@ let contributions_sociales_aides_personnelle_logement (contributions_sociales_ai
          try
            (handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=520; start_column=10; end_line=520; end_column=17;
+                start_line=520; start_column=12; end_line=520; end_column=19;
                 law_headings=["Calcul des contributions sociales s'appliquant aux aides personnelles au logement";
                                "Déclarations des champs d'application";
                                "Prologue : aides au logement"]} ([||])
@@ -2156,14 +2156,14 @@ let contributions_sociales_aides_personnelle_logement (contributions_sociales_ai
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/prologue.catala_fr";
-             start_line=520; start_column=10; end_line=520; end_column=17;
+             start_line=520; start_column=12; end_line=520; end_column=19;
              law_headings=["Calcul des contributions sociales s'appliquant aux aides personnelles au logement";
                             "Déclarations des champs d'application";
                             "Prologue : aides au logement"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=520; start_column=10; end_line=520; end_column=17;
+        start_line=520; start_column=12; end_line=520; end_column=19;
         law_headings=["Calcul des contributions sociales s'appliquant aux aides personnelles au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -2367,7 +2367,7 @@ let calcul_equivalence_loyer_minimale (calcul_equivalence_loyer_minimale_in: Cal
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=596; start_column=10; end_line=596; end_column=17;
+           start_line=596; start_column=12; end_line=596; end_column=19;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -2375,8 +2375,8 @@ let calcul_equivalence_loyer_minimale (calcul_equivalence_loyer_minimale_in: Cal
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=596; start_column=10;
-                   end_line=596; end_column=17;
+                   start_line=596; start_column=12;
+                   end_line=596; end_column=19;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -2497,7 +2497,7 @@ let calcul_equivalence_loyer_minimale (calcul_equivalence_loyer_minimale_in: Cal
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=596; start_column=10; end_line=596; end_column=17;
+        start_line=596; start_column=12; end_line=596; end_column=19;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -2514,7 +2514,7 @@ let calcul_nombre_part_logement_foyer (calcul_nombre_part_logement_foyer_in: Cal
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=603; start_column=10; end_line=603; end_column=32;
+           start_line=603; start_column=12; end_line=603; end_column=34;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -2522,8 +2522,8 @@ let calcul_nombre_part_logement_foyer (calcul_nombre_part_logement_foyer_in: Cal
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=603; start_column=10;
-                   end_line=603; end_column=32;
+                   start_line=603; start_column=12;
+                   end_line=603; end_column=34;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -2613,7 +2613,7 @@ let calcul_nombre_part_logement_foyer (calcul_nombre_part_logement_foyer_in: Cal
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=603; start_column=10; end_line=603; end_column=32;
+        start_line=603; start_column=12; end_line=603; end_column=34;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -2630,7 +2630,7 @@ let calcul_nombre_parts_accession_propriete (calcul_nombre_parts_accession_propr
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=659; start_column=10; end_line=659; end_column=32;
+           start_line=659; start_column=12; end_line=659; end_column=34;
            law_headings=["Secteur accession à la propriété";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -2674,7 +2674,7 @@ let calcul_nombre_parts_accession_propriete (calcul_nombre_parts_accession_propr
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=659; start_column=10; end_line=659; end_column=32;
+        start_line=659; start_column=12; end_line=659; end_column=34;
         law_headings=["Secteur accession à la propriété";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -2689,15 +2689,15 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=998; start_column=10; end_line=998; end_column=29;
+           start_line=998; start_column=12; end_line=998; end_column=31;
            law_headings=["Date d'ouverture des droits à la retraite";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=998; start_column=10;
-                   end_line=998; end_column=29;
+                   start_line=998; start_column=12;
+                   end_line=998; end_column=31;
                    law_headings=["Date d'ouverture des droits à la retraite";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -2720,8 +2720,8 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=998; start_column=10;
-                   end_line=998; end_column=29;
+                   start_line=998; start_column=12;
+                   end_line=998; end_column=31;
                    law_headings=["Date d'ouverture des droits à la retraite";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -2744,8 +2744,8 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=998; start_column=10;
-                   end_line=998; end_column=29;
+                   start_line=998; start_column=12;
+                   end_line=998; end_column=31;
                    law_headings=["Date d'ouverture des droits à la retraite";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -2773,8 +2773,8 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=998; start_column=10;
-                   end_line=998; end_column=29;
+                   start_line=998; start_column=12;
+                   end_line=998; end_column=31;
                    law_headings=["Date d'ouverture des droits à la retraite";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -2799,8 +2799,8 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=998; start_column=10;
-                   end_line=998; end_column=29;
+                   start_line=998; start_column=12;
+                   end_line=998; end_column=31;
                    law_headings=["Date d'ouverture des droits à la retraite";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -2825,8 +2825,8 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=998; start_column=10;
-                   end_line=998; end_column=29;
+                   start_line=998; start_column=12;
+                   end_line=998; end_column=31;
                    law_headings=["Date d'ouverture des droits à la retraite";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -2852,7 +2852,7 @@ let ouverture_droits_retraite (ouverture_droits_retraite_in: OuvertureDroitsRetr
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=998; start_column=10; end_line=998; end_column=29;
+        start_line=998; start_column=12; end_line=998; end_column=31;
         law_headings=["Date d'ouverture des droits à la retraite";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -3243,23 +3243,23 @@ let impaye_depense_logement (impaye_depense_logement_in: ImpayeDepenseLogementIn
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=1018; start_column=10; end_line=1018; end_column=24;
+           start_line=1018; start_column=12; end_line=1018; end_column=26;
            law_headings=["Quantification des impayés de dépense de logement";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=1018; start_column=10;
-                   end_line=1018; end_column=24;
+                   start_line=1018; start_column=12;
+                   end_line=1018; end_column=26;
                    law_headings=["Quantification des impayés de dépense de logement";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]}
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=1018; start_column=10;
-                           end_line=1018; end_column=24;
+                           start_line=1018; start_column=12;
+                           end_line=1018; end_column=26;
                            law_headings=["Quantification des impayés de dépense de logement";
                                           "Calcul du montant de l'allocation logement";
                                           "Prologue : aides au logement"]}
@@ -3308,7 +3308,7 @@ let impaye_depense_logement (impaye_depense_logement_in: ImpayeDepenseLogementIn
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1018; start_column=10; end_line=1018; end_column=24;
+        start_line=1018; start_column=12; end_line=1018; end_column=26;
         law_headings=["Quantification des impayés de dépense de logement";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -3321,12 +3321,12 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
     try
       (handle_default
          {filename = "examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-           start_line=6; start_column=10; end_line=6; end_column=17;
+           start_line=6; start_column=12; end_line=6; end_column=19;
            law_headings=["Montant de la base mensuelle des allocations familiales"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -3344,7 +3344,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -3362,7 +3362,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -3380,7 +3380,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -3399,7 +3399,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-        start_line=6; start_column=10; end_line=6; end_column=17;
+        start_line=6; start_column=12; end_line=6; end_column=19;
         law_headings=["Montant de la base mensuelle des allocations familiales"]})))) in
   {BaseMensuelleAllocationsFamiliales.montant = montant_}
 
@@ -3411,14 +3411,14 @@ let smic (smic_in: SmicIn.t) : Smic.t =
     try
       (handle_default
          {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-           start_line=11; start_column=10; end_line=11; end_column=22;
+           start_line=11; start_column=12; end_line=11; end_column=24;
            law_headings=["Prologue";
                           "Montant du salaire minimum de croissance"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3461,8 +3461,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3484,8 +3484,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3528,8 +3528,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3551,8 +3551,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3595,8 +3595,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3618,8 +3618,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3662,8 +3662,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3685,8 +3685,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3729,8 +3729,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -3753,7 +3753,7 @@ let smic (smic_in: SmicIn.t) : Smic.t =
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr";
-        start_line=11; start_column=10; end_line=11; end_column=22;
+        start_line=11; start_column=12; end_line=11; end_column=24;
         law_headings=["Prologue"; "Montant du salaire minimum de croissance"]})))) in
   {Smic.brut_horaire = brut_horaire_}
 
@@ -3870,7 +3870,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=564; start_column=10; end_line=564; end_column=36;
+           start_line=564; start_column=12; end_line=564; end_column=38;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -3878,8 +3878,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=564; start_column=10;
-                   end_line=564; end_column=36;
+                   start_line=564; start_column=12;
+                   end_line=564; end_column=38;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -3887,8 +3887,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=564; start_column=10;
-                           end_line=564; end_column=36;
+                           start_line=564; start_column=12;
+                           end_line=564; end_column=38;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -3896,8 +3896,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                          ([|(fun (_: unit) ->
                                handle_default
                                  {filename = "examples/aides_logement/prologue.catala_fr";
-                                   start_line=564; start_column=10;
-                                   end_line=564; end_column=36;
+                                   start_line=564; start_column=12;
+                                   end_line=564; end_column=38;
                                    law_headings=["Secteur locatif";
                                                   "Calcul du montant de l'aide personnalisée au logement";
                                                   "Déclarations des champs d'application";
@@ -4084,7 +4084,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=564; start_column=10; end_line=564; end_column=36;
+        start_line=564; start_column=12; end_line=564; end_column=38;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -4463,7 +4463,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=562; start_column=10; end_line=562; end_column=33;
+           start_line=562; start_column=12; end_line=562; end_column=35;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -4471,8 +4471,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=562; start_column=10;
-                   end_line=562; end_column=33;
+                   start_line=562; start_column=12;
+                   end_line=562; end_column=35;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -4480,8 +4480,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4520,8 +4520,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4560,8 +4560,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4614,8 +4614,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4657,8 +4657,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4700,8 +4700,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4757,8 +4757,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4801,8 +4801,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4845,8 +4845,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4904,8 +4904,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=562; start_column=10;
-                   end_line=562; end_column=33;
+                   start_line=562; start_column=12;
+                   end_line=562; end_column=35;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -4913,8 +4913,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=562; start_column=10;
-                           end_line=562; end_column=33;
+                           start_line=562; start_column=12;
+                           end_line=562; end_column=35;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -4922,8 +4922,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                          ([|(fun (_: unit) ->
                                handle_default
                                  {filename = "examples/aides_logement/prologue.catala_fr";
-                                   start_line=562; start_column=10;
-                                   end_line=562; end_column=33;
+                                   start_line=562; start_column=12;
+                                   end_line=562; end_column=35;
                                    law_headings=["Secteur locatif";
                                                   "Calcul du montant de l'aide personnalisée au logement";
                                                   "Déclarations des champs d'application";
@@ -4954,8 +4954,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                             (fun (_: unit) ->
                                handle_default
                                  {filename = "examples/aides_logement/prologue.catala_fr";
-                                   start_line=562; start_column=10;
-                                   end_line=562; end_column=33;
+                                   start_line=562; start_column=12;
+                                   end_line=562; end_column=35;
                                    law_headings=["Secteur locatif";
                                                   "Calcul du montant de l'aide personnalisée au logement";
                                                   "Déclarations des champs d'application";
@@ -4989,8 +4989,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                             (fun (_: unit) ->
                                handle_default
                                  {filename = "examples/aides_logement/prologue.catala_fr";
-                                   start_line=562; start_column=10;
-                                   end_line=562; end_column=33;
+                                   start_line=562; start_column=12;
+                                   end_line=562; end_column=35;
                                    law_headings=["Secteur locatif";
                                                   "Calcul du montant de l'aide personnalisée au logement";
                                                   "Déclarations des champs d'application";
@@ -5028,8 +5028,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5037,8 +5037,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                       ([|(fun (_: unit) ->
                             handle_default
                               {filename = "examples/aides_logement/prologue.catala_fr";
-                                start_line=562; start_column=10;
-                                end_line=562; end_column=33;
+                                start_line=562; start_column=12;
+                                end_line=562; end_column=35;
                                 law_headings=["Secteur locatif";
                                                "Calcul du montant de l'aide personnalisée au logement";
                                                "Déclarations des champs d'application";
@@ -5067,8 +5067,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                          (fun (_: unit) ->
                             handle_default
                               {filename = "examples/aides_logement/prologue.catala_fr";
-                                start_line=562; start_column=10;
-                                end_line=562; end_column=33;
+                                start_line=562; start_column=12;
+                                end_line=562; end_column=35;
                                 law_headings=["Secteur locatif";
                                                "Calcul du montant de l'aide personnalisée au logement";
                                                "Déclarations des champs d'application";
@@ -5100,8 +5100,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                          (fun (_: unit) ->
                             handle_default
                               {filename = "examples/aides_logement/prologue.catala_fr";
-                                start_line=562; start_column=10;
-                                end_line=562; end_column=33;
+                                start_line=562; start_column=12;
+                                end_line=562; end_column=35;
                                 law_headings=["Secteur locatif";
                                                "Calcul du montant de l'aide personnalisée au logement";
                                                "Déclarations des champs d'application";
@@ -5137,7 +5137,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
          (fun (_: unit) ->
             handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=562; start_column=10; end_line=562; end_column=33;
+                start_line=562; start_column=12; end_line=562; end_column=35;
                 law_headings=["Secteur locatif";
                                "Calcul du montant de l'aide personnalisée au logement";
                                "Déclarations des champs d'application";
@@ -5145,8 +5145,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5183,8 +5183,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5221,8 +5221,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5270,8 +5270,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5311,8 +5311,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5352,8 +5352,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5404,8 +5404,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5446,8 +5446,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5488,8 +5488,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=562; start_column=10;
-                        end_line=562; end_column=33;
+                        start_line=562; start_column=12;
+                        end_line=562; end_column=35;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5542,7 +5542,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=562; start_column=10; end_line=562; end_column=33;
+        start_line=562; start_column=12; end_line=562; end_column=35;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -5553,7 +5553,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=561; start_column=10; end_line=561; end_column=45;
+           start_line=561; start_column=12; end_line=561; end_column=47;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -5561,8 +5561,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=561; start_column=10;
-                   end_line=561; end_column=45;
+                   start_line=561; start_column=12;
+                   end_line=561; end_column=47;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -5570,8 +5570,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=561; start_column=10;
-                           end_line=561; end_column=45;
+                           start_line=561; start_column=12;
+                           end_line=561; end_column=47;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -5601,8 +5601,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=561; start_column=10;
-                           end_line=561; end_column=45;
+                           start_line=561; start_column=12;
+                           end_line=561; end_column=47;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -5635,8 +5635,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                     (fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=561; start_column=10;
-                           end_line=561; end_column=45;
+                           start_line=561; start_column=12;
+                           end_line=561; end_column=47;
                            law_headings=["Secteur locatif";
                                           "Calcul du montant de l'aide personnalisée au logement";
                                           "Déclarations des champs d'application";
@@ -5672,7 +5672,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
          (fun (_: unit) ->
             handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=561; start_column=10; end_line=561; end_column=45;
+                start_line=561; start_column=12; end_line=561; end_column=47;
                 law_headings=["Secteur locatif";
                                "Calcul du montant de l'aide personnalisée au logement";
                                "Déclarations des champs d'application";
@@ -5680,8 +5680,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=561; start_column=10;
-                        end_line=561; end_column=45;
+                        start_line=561; start_column=12;
+                        end_line=561; end_column=47;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5703,8 +5703,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=561; start_column=10;
-                        end_line=561; end_column=45;
+                        start_line=561; start_column=12;
+                        end_line=561; end_column=47;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5729,8 +5729,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
                  (fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=561; start_column=10;
-                        end_line=561; end_column=45;
+                        start_line=561; start_column=12;
+                        end_line=561; end_column=47;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'aide personnalisée au logement";
                                        "Déclarations des champs d'application";
@@ -5757,7 +5757,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=561; start_column=10; end_line=561; end_column=45;
+        start_line=561; start_column=12; end_line=561; end_column=47;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -5998,7 +5998,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=563; start_column=10; end_line=563; end_column=32;
+           start_line=563; start_column=12; end_line=563; end_column=34;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -6006,8 +6006,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=563; start_column=10;
-                   end_line=563; end_column=32;
+                   start_line=563; start_column=12;
+                   end_line=563; end_column=34;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -6037,8 +6037,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=563; start_column=10;
-                   end_line=563; end_column=32;
+                   start_line=563; start_column=12;
+                   end_line=563; end_column=34;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -6071,8 +6071,8 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=563; start_column=10;
-                   end_line=563; end_column=32;
+                   start_line=563; start_column=12;
+                   end_line=563; end_column=34;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -6107,7 +6107,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=563; start_column=10; end_line=563; end_column=32;
+        start_line=563; start_column=12; end_line=563; end_column=34;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -6793,7 +6793,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=565; start_column=10; end_line=565; end_column=35;
+           start_line=565; start_column=12; end_line=565; end_column=37;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -6827,7 +6827,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=565; start_column=10; end_line=565; end_column=35;
+        start_line=565; start_column=12; end_line=565; end_column=37;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -6838,7 +6838,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=570; start_column=10; end_line=570; end_column=29;
+           start_line=570; start_column=12; end_line=570; end_column=31;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -6867,7 +6867,7 @@ let calcul_aide_personnalisee_logement_locatif (calcul_aide_personnalisee_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=570; start_column=10; end_line=570; end_column=29;
+        start_line=570; start_column=12; end_line=570; end_column=31;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -6962,7 +6962,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=618; start_column=10; end_line=618; end_column=31;
+           start_line=618; start_column=12; end_line=618; end_column=33;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -6977,7 +6977,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=618; start_column=10; end_line=618; end_column=31;
+        start_line=618; start_column=12; end_line=618; end_column=33;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -7130,7 +7130,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=621; start_column=10; end_line=621; end_column=44;
+           start_line=621; start_column=12; end_line=621; end_column=46;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -7138,8 +7138,8 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=621; start_column=10;
-                   end_line=621; end_column=44;
+                   start_line=621; start_column=12;
+                   end_line=621; end_column=46;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -7249,8 +7249,8 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=621; start_column=10;
-                   end_line=621; end_column=44;
+                   start_line=621; start_column=12;
+                   end_line=621; end_column=46;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -7363,8 +7363,8 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=621; start_column=10;
-                   end_line=621; end_column=44;
+                   start_line=621; start_column=12;
+                   end_line=621; end_column=46;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -7479,7 +7479,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=621; start_column=10; end_line=621; end_column=44;
+        start_line=621; start_column=12; end_line=621; end_column=46;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -7701,7 +7701,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=617; start_column=10; end_line=617; end_column=44;
+           start_line=617; start_column=12; end_line=617; end_column=46;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -7719,7 +7719,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=617; start_column=10; end_line=617; end_column=44;
+        start_line=617; start_column=12; end_line=617; end_column=46;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -7730,7 +7730,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=620; start_column=10; end_line=620; end_column=36;
+           start_line=620; start_column=12; end_line=620; end_column=38;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -7754,7 +7754,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=620; start_column=10; end_line=620; end_column=36;
+        start_line=620; start_column=12; end_line=620; end_column=38;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -7765,7 +7765,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=619; start_column=19; end_line=619; end_column=41;
+           start_line=619; start_column=21; end_line=619; end_column=43;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -7775,7 +7775,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
          (fun (_: unit) ->
             handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=619; start_column=19; end_line=619; end_column=41;
+                start_line=619; start_column=21; end_line=619; end_column=43;
                 law_headings=["Secteur logement-foyer";
                                "Calcul du montant de l'aide personnalisée au logement";
                                "Déclarations des champs d'application";
@@ -7798,7 +7798,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=619; start_column=19; end_line=619; end_column=41;
+        start_line=619; start_column=21; end_line=619; end_column=43;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -8126,7 +8126,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=628; start_column=10; end_line=628; end_column=36;
+           start_line=628; start_column=12; end_line=628; end_column=38;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -8147,7 +8147,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=628; start_column=10; end_line=628; end_column=36;
+        start_line=628; start_column=12; end_line=628; end_column=38;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -8451,7 +8451,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=641; start_column=10; end_line=641; end_column=29;
+           start_line=641; start_column=12; end_line=641; end_column=31;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -8480,7 +8480,7 @@ let calcul_aide_personnalisee_logement_foyer (calcul_aide_personnalisee_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=641; start_column=10; end_line=641; end_column=29;
+        start_line=641; start_column=12; end_line=641; end_column=31;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -13834,7 +13834,7 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=680; start_column=10; end_line=680; end_column=29;
+           start_line=680; start_column=12; end_line=680; end_column=31;
            law_headings=["Secteur accession à la propriété";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -13842,8 +13842,8 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=680; start_column=10;
-                   end_line=680; end_column=29;
+                   start_line=680; start_column=12;
+                   end_line=680; end_column=31;
                    law_headings=["Secteur accession à la propriété";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -13913,8 +13913,8 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=680; start_column=10;
-                   end_line=680; end_column=29;
+                   start_line=680; start_column=12;
+                   end_line=680; end_column=31;
                    law_headings=["Secteur accession à la propriété";
                                   "Calcul du montant de l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
@@ -13943,7 +13943,7 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=680; start_column=10; end_line=680; end_column=29;
+        start_line=680; start_column=12; end_line=680; end_column=31;
         law_headings=["Secteur accession à la propriété";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -14068,7 +14068,7 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=679; start_column=10; end_line=679; end_column=29;
+           start_line=679; start_column=12; end_line=679; end_column=31;
            law_headings=["Secteur accession à la propriété";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -14093,7 +14093,7 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=679; start_column=10; end_line=679; end_column=29;
+        start_line=679; start_column=12; end_line=679; end_column=31;
         law_headings=["Secteur accession à la propriété";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -14219,7 +14219,7 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=711; start_column=10; end_line=711; end_column=29;
+           start_line=711; start_column=12; end_line=711; end_column=31;
            law_headings=["Secteur accession à la propriété";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -14249,7 +14249,7 @@ let calcul_aide_personnalisee_logement_accession_propriete (calcul_aide_personna
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=711; start_column=10; end_line=711; end_column=29;
+        start_line=711; start_column=12; end_line=711; end_column=31;
         law_headings=["Secteur accession à la propriété";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -15519,15 +15519,15 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=320; start_column=10; end_line=320; end_column=21;
+           start_line=320; start_column=12; end_line=320; end_column=23;
            law_headings=["Éligibilité aux aides personnelles au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=320; start_column=10;
-                   end_line=320; end_column=21;
+                   start_line=320; start_column=12;
+                   end_line=320; end_column=23;
                    law_headings=["Éligibilité aux aides personnelles au logement";
                                   "Déclarations des champs d'application";
                                   "Prologue : aides au logement"]} ([||])
@@ -15543,7 +15543,7 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
                           eligibilite_logement_)))) (fun (_: unit) -> true))|])
          (fun (_: unit) -> (log_decision_taken
             {filename = "examples/aides_logement/prologue.catala_fr";
-              start_line=320; start_column=10; end_line=320; end_column=21;
+              start_line=320; start_column=12; end_line=320; end_column=23;
               law_headings=["Éligibilité aux aides personnelles au logement";
                              "Déclarations des champs d'application";
                              "Prologue : aides au logement"]} true))
@@ -15551,7 +15551,7 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=320; start_column=10; end_line=320; end_column=21;
+        start_line=320; start_column=12; end_line=320; end_column=23;
         law_headings=["Éligibilité aux aides personnelles au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -15563,15 +15563,15 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
          try
            (handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=324; start_column=10; end_line=324; end_column=28;
+                start_line=324; start_column=12; end_line=324; end_column=30;
                 law_headings=["Éligibilité aux aides personnelles au logement";
                                "Déclarations des champs d'application";
                                "Prologue : aides au logement"]}
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=324; start_column=10;
-                        end_line=324; end_column=28;
+                        start_line=324; start_column=12;
+                        end_line=324; end_column=30;
                         law_headings=["Éligibilité aux aides personnelles au logement";
                                        "Déclarations des champs d'application";
                                        "Prologue : aides au logement"]}
@@ -15624,8 +15624,8 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
                       (fun (_: unit) -> true))|])
               (fun (_: unit) -> (log_decision_taken
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=324; start_column=10;
-                   end_line=324; end_column=28;
+                   start_line=324; start_column=12;
+                   end_line=324; end_column=30;
                    law_headings=["Éligibilité aux aides personnelles au logement";
                                   "Déclarations des champs d'application";
                                   "Prologue : aides au logement"]} true))
@@ -15633,14 +15633,14 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/prologue.catala_fr";
-             start_line=324; start_column=10; end_line=324; end_column=28;
+             start_line=324; start_column=12; end_line=324; end_column=30;
              law_headings=["Éligibilité aux aides personnelles au logement";
                             "Déclarations des champs d'application";
                             "Prologue : aides au logement"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=324; start_column=10; end_line=324; end_column=28;
+        start_line=324; start_column=12; end_line=324; end_column=30;
         law_headings=["Éligibilité aux aides personnelles au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -15826,7 +15826,7 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=322; start_column=10; end_line=322; end_column=59;
+           start_line=322; start_column=12; end_line=322; end_column=61;
            law_headings=["Éligibilité aux aides personnelles au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -15867,7 +15867,7 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=322; start_column=10; end_line=322; end_column=59;
+        start_line=322; start_column=12; end_line=322; end_column=61;
         law_headings=["Éligibilité aux aides personnelles au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -15877,7 +15877,7 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=321; start_column=10; end_line=321; end_column=52;
+           start_line=321; start_column=12; end_line=321; end_column=54;
            law_headings=["Éligibilité aux aides personnelles au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -15891,7 +15891,7 @@ let eligibilite_aides_personnelle_logement (eligibilite_aides_personnelle_logeme
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=321; start_column=10; end_line=321; end_column=52;
+        start_line=321; start_column=12; end_line=321; end_column=54;
         law_headings=["Éligibilité aux aides personnelles au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -16244,15 +16244,15 @@ let ressources_aides_personnelle_logement (ressources_aides_personnelle_logement
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=508; start_column=10; end_line=508; end_column=37;
+           start_line=508; start_column=12; end_line=508; end_column=39;
            law_headings=["Prise en compte des ressources pour les aides personnelles au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=508; start_column=10;
-                   end_line=508; end_column=37;
+                   start_line=508; start_column=12;
+                   end_line=508; end_column=39;
                    law_headings=["Prise en compte des ressources pour les aides personnelles au logement";
                                   "Déclarations des champs d'application";
                                   "Prologue : aides au logement"]} ([||])
@@ -16308,7 +16308,7 @@ let ressources_aides_personnelle_logement (ressources_aides_personnelle_logement
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=508; start_column=10; end_line=508; end_column=37;
+        start_line=508; start_column=12; end_line=508; end_column=39;
         law_headings=["Prise en compte des ressources pour les aides personnelles au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -16398,7 +16398,7 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
     try
       (handle_default
          {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-           start_line=43; start_column=10; end_line=43; end_column=22;
+           start_line=43; start_column=12; end_line=43; end_column=24;
            law_headings=["Prologue : prestations familiales"]} ([||])
          (fun (_: unit) -> (log_decision_taken
             {filename = "examples/aides_logement/../prestations_familiales/sécurité_sociale_R.catala_fr";
@@ -16413,7 +16413,7 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-        start_line=43; start_column=10; end_line=43; end_column=22;
+        start_line=43; start_column=12; end_line=43; end_column=24;
         law_headings=["Prologue : prestations familiales"]})))) in
   let smic_dot_date_courante_: date = 
     try ((log_variable_definition
@@ -16463,13 +16463,13 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
     try
       (handle_default
          {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-           start_line=44; start_column=10; end_line=44; end_column=33;
+           start_line=44; start_column=12; end_line=44; end_column=35;
            law_headings=["Prologue : prestations familiales"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                   start_line=44; start_column=10;
-                   end_line=44; end_column=33;
+                   start_line=44; start_column=12;
+                   end_line=44; end_column=35;
                    law_headings=["Prologue : prestations familiales"]} (
                  [||])
                  (fun (_: unit) -> (log_decision_taken
@@ -16496,13 +16496,13 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
                  (fun (_: unit) -> true))|])
          (fun (_: unit) -> (log_decision_taken
             {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-              start_line=44; start_column=10; end_line=44; end_column=33;
+              start_line=44; start_column=12; end_line=44; end_column=35;
               law_headings=["Prologue : prestations familiales"]} true))
          (fun (_: unit) -> false))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-        start_line=44; start_column=10; end_line=44; end_column=33;
+        start_line=44; start_column=12; end_line=44; end_column=35;
         law_headings=["Prologue : prestations familiales"]})))) in
   let plafond_l512_3_2_: money = (log_variable_definition
     ["ÉligibilitéPrestationsFamiliales"; "plafond_l512_3_2"] (embed_money)
@@ -16561,13 +16561,13 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
          try
            (handle_default
               {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                start_line=41; start_column=10; end_line=41; end_column=29;
+                start_line=41; start_column=12; end_line=41; end_column=31;
                 law_headings=["Prologue : prestations familiales"]}
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                        start_line=41; start_column=10;
-                        end_line=41; end_column=29;
+                        start_line=41; start_column=12;
+                        end_line=41; end_column=31;
                         law_headings=["Prologue : prestations familiales"]}
                       ([||])
                       (fun (_: unit) -> (log_decision_taken
@@ -16614,19 +16614,19 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
                                plafond_l512_3_2_)))) (fun (_: unit) -> true))|])
               (fun (_: unit) -> (log_decision_taken
                  {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                   start_line=41; start_column=10;
-                   end_line=41; end_column=29;
+                   start_line=41; start_column=12;
+                   end_line=41; end_column=31;
                    law_headings=["Prologue : prestations familiales"]} true))
               (fun (_: unit) -> false))
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-             start_line=41; start_column=10; end_line=41; end_column=29;
+             start_line=41; start_column=12; end_line=41; end_column=31;
              law_headings=["Prologue : prestations familiales"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-        start_line=41; start_column=10; end_line=41; end_column=29;
+        start_line=41; start_column=12; end_line=41; end_column=31;
         law_headings=["Prologue : prestations familiales"]})))) in
   let droit_ouvert_: EnfantPrestationsFamiliales.t -> bool = (log_variable_definition
     ["ÉligibilitéPrestationsFamiliales"; "droit_ouvert"] (unembeddable) (
@@ -16635,25 +16635,25 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
          try
            (handle_default
               {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                start_line=40; start_column=10; end_line=40; end_column=22;
+                start_line=40; start_column=12; end_line=40; end_column=24;
                 law_headings=["Prologue : prestations familiales"]}
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                        start_line=40; start_column=10;
-                        end_line=40; end_column=22;
+                        start_line=40; start_column=12;
+                        end_line=40; end_column=24;
                         law_headings=["Prologue : prestations familiales"]}
                       ([|(fun (_: unit) ->
                             handle_default
                               {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                                start_line=40; start_column=10;
-                                end_line=40; end_column=22;
+                                start_line=40; start_column=12;
+                                end_line=40; end_column=24;
                                 law_headings=["Prologue : prestations familiales"]}
                               ([|(fun (_: unit) ->
                                     handle_default
                                       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                                        start_line=40; start_column=10;
-                                        end_line=40; end_column=22;
+                                        start_line=40; start_column=12;
+                                        end_line=40; end_column=24;
                                         law_headings=["Prologue : prestations familiales"]}
                                       ([||])
                                       (fun (_: unit) -> (log_decision_taken
@@ -16719,19 +16719,19 @@ let eligibilite_prestations_familiales (eligibilite_prestations_familiales_in: E
                       (fun (_: unit) -> raise EmptyError))|])
               (fun (_: unit) -> (log_decision_taken
                  {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-                   start_line=40; start_column=10;
-                   end_line=40; end_column=22;
+                   start_line=40; start_column=12;
+                   end_line=40; end_column=24;
                    law_headings=["Prologue : prestations familiales"]} true))
               (fun (_: unit) -> false))
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-             start_line=40; start_column=10; end_line=40; end_column=22;
+             start_line=40; start_column=12; end_line=40; end_column=24;
              law_headings=["Prologue : prestations familiales"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/../prestations_familiales/prologue.catala_fr";
-        start_line=40; start_column=10; end_line=40; end_column=22;
+        start_line=40; start_column=12; end_line=40; end_column=24;
         law_headings=["Prologue : prestations familiales"]})))) in
   {EligibilitePrestationsFamiliales.droit_ouvert = droit_ouvert_;
      EligibilitePrestationsFamiliales.conditions_hors_age =
@@ -17119,15 +17119,15 @@ let calcul_allocation_logement_locatif (calcul_allocation_logement_locatif_in: C
          try
            (handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=788; start_column=10; end_line=788; end_column=32;
+                start_line=788; start_column=12; end_line=788; end_column=34;
                 law_headings=["Secteur locatif";
                                "Calcul du montant de l'allocation logement";
                                "Prologue : aides au logement"]}
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/aides_logement/prologue.catala_fr";
-                        start_line=788; start_column=10;
-                        end_line=788; end_column=32;
+                        start_line=788; start_column=12;
+                        end_line=788; end_column=34;
                         law_headings=["Secteur locatif";
                                        "Calcul du montant de l'allocation logement";
                                        "Prologue : aides au logement"]}
@@ -17174,14 +17174,14 @@ let calcul_allocation_logement_locatif (calcul_allocation_logement_locatif_in: C
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/prologue.catala_fr";
-             start_line=788; start_column=10; end_line=788; end_column=32;
+             start_line=788; start_column=12; end_line=788; end_column=34;
              law_headings=["Secteur locatif";
                             "Calcul du montant de l'allocation logement";
                             "Prologue : aides au logement"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=788; start_column=10; end_line=788; end_column=32;
+        start_line=788; start_column=12; end_line=788; end_column=34;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -17191,15 +17191,15 @@ let calcul_allocation_logement_locatif (calcul_allocation_logement_locatif_in: C
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=786; start_column=10; end_line=786; end_column=29;
+           start_line=786; start_column=12; end_line=786; end_column=31;
            law_headings=["Secteur locatif";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=786; start_column=10;
-                   end_line=786; end_column=29;
+                   start_line=786; start_column=12;
+                   end_line=786; end_column=31;
                    law_headings=["Secteur locatif";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -17240,7 +17240,7 @@ let calcul_allocation_logement_locatif (calcul_allocation_logement_locatif_in: C
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=786; start_column=10; end_line=786; end_column=29;
+        start_line=786; start_column=12; end_line=786; end_column=31;
         law_headings=["Secteur locatif";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -17749,15 +17749,15 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=932; start_column=10; end_line=932; end_column=37;
+           start_line=932; start_column=12; end_line=932; end_column=39;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=932; start_column=10;
-                   end_line=932; end_column=37;
+                   start_line=932; start_column=12;
+                   end_line=932; end_column=39;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -17780,8 +17780,8 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=932; start_column=10;
-                   end_line=932; end_column=37;
+                   start_line=932; start_column=12;
+                   end_line=932; end_column=39;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -17808,7 +17808,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=932; start_column=10; end_line=932; end_column=37;
+        start_line=932; start_column=12; end_line=932; end_column=39;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -17817,15 +17817,15 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=931; start_column=10; end_line=931; end_column=27;
+           start_line=931; start_column=12; end_line=931; end_column=29;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=931; start_column=10;
-                   end_line=931; end_column=27;
+                   start_line=931; start_column=12;
+                   end_line=931; end_column=29;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -17859,8 +17859,8 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=931; start_column=10;
-                   end_line=931; end_column=27;
+                   start_line=931; start_column=12;
+                   end_line=931; end_column=29;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -17894,16 +17894,16 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=931; start_column=10;
-                   end_line=931; end_column=27;
+                   start_line=931; start_column=12;
+                   end_line=931; end_column=29;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]}
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=931; start_column=10;
-                           end_line=931; end_column=27;
+                           start_line=931; start_column=12;
+                           end_line=931; end_column=29;
                            law_headings=["Secteur logement-foyer";
                                           "Calcul du montant de l'allocation logement";
                                           "Prologue : aides au logement"]}
@@ -17965,8 +17965,8 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=931; start_column=10;
-                   end_line=931; end_column=27;
+                   start_line=931; start_column=12;
+                   end_line=931; end_column=29;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -18003,8 +18003,8 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=931; start_column=10;
-                   end_line=931; end_column=27;
+                   start_line=931; start_column=12;
+                   end_line=931; end_column=29;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]} ([||])
@@ -18041,16 +18041,16 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=931; start_column=10;
-                   end_line=931; end_column=27;
+                   start_line=931; start_column=12;
+                   end_line=931; end_column=29;
                    law_headings=["Secteur logement-foyer";
                                   "Calcul du montant de l'allocation logement";
                                   "Prologue : aides au logement"]}
                  ([|(fun (_: unit) ->
                        handle_default
                          {filename = "examples/aides_logement/prologue.catala_fr";
-                           start_line=931; start_column=10;
-                           end_line=931; end_column=27;
+                           start_line=931; start_column=12;
+                           end_line=931; end_column=29;
                            law_headings=["Secteur logement-foyer";
                                           "Calcul du montant de l'allocation logement";
                                           "Prologue : aides au logement"]}
@@ -18119,7 +18119,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=931; start_column=10; end_line=931; end_column=27;
+        start_line=931; start_column=12; end_line=931; end_column=29;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -18295,7 +18295,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=930; start_column=10; end_line=930; end_column=37;
+           start_line=930; start_column=12; end_line=930; end_column=39;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]} ([||])
@@ -18315,7 +18315,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=930; start_column=10; end_line=930; end_column=37;
+        start_line=930; start_column=12; end_line=930; end_column=39;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -18366,7 +18366,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=933; start_column=10; end_line=933; end_column=23;
+           start_line=933; start_column=12; end_line=933; end_column=25;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]} ([||])
@@ -18385,7 +18385,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=933; start_column=10; end_line=933; end_column=23;
+        start_line=933; start_column=12; end_line=933; end_column=25;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -18460,7 +18460,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=943; start_column=10; end_line=943; end_column=29;
+           start_line=943; start_column=12; end_line=943; end_column=31;
            law_headings=["Secteur logement-foyer";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]} ([||])
@@ -18484,7 +18484,7 @@ let calcul_allocation_logement_foyer (calcul_allocation_logement_foyer_in: Calcu
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=943; start_column=10; end_line=943; end_column=29;
+        start_line=943; start_column=12; end_line=943; end_column=31;
         law_headings=["Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -24089,7 +24089,7 @@ let calcul_allocation_logement_accession_propriete (calcul_allocation_logement_a
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=876; start_column=10; end_line=876; end_column=29;
+           start_line=876; start_column=12; end_line=876; end_column=31;
            law_headings=["Secteur accession à la propriété";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]} ([||])
@@ -24113,7 +24113,7 @@ let calcul_allocation_logement_accession_propriete (calcul_allocation_logement_a
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=876; start_column=10; end_line=876; end_column=29;
+        start_line=876; start_column=12; end_line=876; end_column=31;
         law_headings=["Secteur accession à la propriété";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -25036,7 +25036,7 @@ let calcul_aide_personnalisee_logement (calcul_aide_personnalisee_logement_in: C
          try
            (handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=746; start_column=10; end_line=746; end_column=32;
+                start_line=746; start_column=12; end_line=746; end_column=34;
                 law_headings=["Tous secteurs";
                                "Calcul du montant de l'aide personnalisée au logement";
                                "Déclarations des champs d'application";
@@ -25059,7 +25059,7 @@ let calcul_aide_personnalisee_logement (calcul_aide_personnalisee_logement_in: C
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/prologue.catala_fr";
-             start_line=746; start_column=10; end_line=746; end_column=32;
+             start_line=746; start_column=12; end_line=746; end_column=34;
              law_headings=["Tous secteurs";
                             "Calcul du montant de l'aide personnalisée au logement";
                             "Déclarations des champs d'application";
@@ -25067,7 +25067,7 @@ let calcul_aide_personnalisee_logement (calcul_aide_personnalisee_logement_in: C
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=746; start_column=10; end_line=746; end_column=32;
+        start_line=746; start_column=12; end_line=746; end_column=34;
         law_headings=["Tous secteurs";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -25078,7 +25078,7 @@ let calcul_aide_personnalisee_logement (calcul_aide_personnalisee_logement_in: C
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=745; start_column=10; end_line=745; end_column=29;
+           start_line=745; start_column=12; end_line=745; end_column=31;
            law_headings=["Tous secteurs";
                           "Calcul du montant de l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
@@ -25099,7 +25099,7 @@ let calcul_aide_personnalisee_logement (calcul_aide_personnalisee_logement_in: C
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=745; start_column=10; end_line=745; end_column=29;
+        start_line=745; start_column=12; end_line=745; end_column=31;
         law_headings=["Tous secteurs";
                        "Calcul du montant de l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
@@ -25525,7 +25525,7 @@ let eligibilite_prime_de_demenagement (eligibilite_prime_de_demenagement_in: Eli
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=464; start_column=10; end_line=464; end_column=36;
+           start_line=464; start_column=12; end_line=464; end_column=38;
            law_headings=["Éligibilité à la prime de déménagement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -25548,7 +25548,7 @@ let eligibilite_prime_de_demenagement (eligibilite_prime_de_demenagement_in: Eli
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=464; start_column=10; end_line=464; end_column=36;
+        start_line=464; start_column=12; end_line=464; end_column=38;
         law_headings=["Éligibilité à la prime de déménagement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -26220,7 +26220,7 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=372; start_column=10; end_line=372; end_column=59;
+           start_line=372; start_column=12; end_line=372; end_column=61;
            law_headings=["Éligibilité à l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -26235,7 +26235,7 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=372; start_column=10; end_line=372; end_column=59;
+        start_line=372; start_column=12; end_line=372; end_column=61;
         law_headings=["Éligibilité à l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -26245,7 +26245,7 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=371; start_column=10; end_line=371; end_column=52;
+           start_line=371; start_column=12; end_line=371; end_column=54;
            law_headings=["Éligibilité à l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -26260,7 +26260,7 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=371; start_column=10; end_line=371; end_column=52;
+        start_line=371; start_column=12; end_line=371; end_column=54;
         law_headings=["Éligibilité à l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -26270,15 +26270,15 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=370; start_column=10; end_line=370; end_column=21;
+           start_line=370; start_column=12; end_line=370; end_column=23;
            law_headings=["Éligibilité à l'aide personnalisée au logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/aides_logement/prologue.catala_fr";
-                   start_line=370; start_column=10;
-                   end_line=370; end_column=21;
+                   start_line=370; start_column=12;
+                   end_line=370; end_column=23;
                    law_headings=["Éligibilité à l'aide personnalisée au logement";
                                   "Déclarations des champs d'application";
                                   "Prologue : aides au logement"]} ([||])
@@ -26297,7 +26297,7 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
                  (fun (_: unit) -> true))|])
          (fun (_: unit) -> (log_decision_taken
             {filename = "examples/aides_logement/prologue.catala_fr";
-              start_line=370; start_column=10; end_line=370; end_column=21;
+              start_line=370; start_column=12; end_line=370; end_column=23;
               law_headings=["Éligibilité à l'aide personnalisée au logement";
                              "Déclarations des champs d'application";
                              "Prologue : aides au logement"]} true))
@@ -26305,7 +26305,7 @@ let eligibilite_aide_personnalisee_logement (eligibilite_aide_personnalisee_loge
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=370; start_column=10; end_line=370; end_column=21;
+        start_line=370; start_column=12; end_line=370; end_column=23;
         law_headings=["Éligibilité à l'aide personnalisée au logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -26845,7 +26845,7 @@ let eligibilite_allocation_logement (eligibilite_allocation_logement_in: Eligibi
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=414; start_column=10; end_line=414; end_column=59;
+           start_line=414; start_column=12; end_line=414; end_column=61;
            law_headings=["Éligibilité aux allocations de logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -26860,7 +26860,7 @@ let eligibilite_allocation_logement (eligibilite_allocation_logement_in: Eligibi
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=414; start_column=10; end_line=414; end_column=59;
+        start_line=414; start_column=12; end_line=414; end_column=61;
         law_headings=["Éligibilité aux allocations de logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -26870,7 +26870,7 @@ let eligibilite_allocation_logement (eligibilite_allocation_logement_in: Eligibi
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=413; start_column=10; end_line=413; end_column=52;
+           start_line=413; start_column=12; end_line=413; end_column=54;
            law_headings=["Éligibilité aux allocations de logement";
                           "Déclarations des champs d'application";
                           "Prologue : aides au logement"]} ([||])
@@ -26885,7 +26885,7 @@ let eligibilite_allocation_logement (eligibilite_allocation_logement_in: Eligibi
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=413; start_column=10; end_line=413; end_column=52;
+        start_line=413; start_column=12; end_line=413; end_column=54;
         law_headings=["Éligibilité aux allocations de logement";
                        "Déclarations des champs d'application";
                        "Prologue : aides au logement"]})))) in
@@ -28562,7 +28562,7 @@ let calcul_allocation_logement (calcul_allocation_logement_in: CalculAllocationL
          try
            (handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=991; start_column=10; end_line=991; end_column=32;
+                start_line=991; start_column=12; end_line=991; end_column=34;
                 law_headings=["Tous secteurs"; "Secteur logement-foyer";
                                "Calcul du montant de l'allocation logement";
                                "Prologue : aides au logement"]} ([||])
@@ -28584,14 +28584,14 @@ let calcul_allocation_logement (calcul_allocation_logement_in: CalculAllocationL
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/prologue.catala_fr";
-             start_line=991; start_column=10; end_line=991; end_column=32;
+             start_line=991; start_column=12; end_line=991; end_column=34;
              law_headings=["Tous secteurs"; "Secteur logement-foyer";
                             "Calcul du montant de l'allocation logement";
                             "Prologue : aides au logement"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=991; start_column=10; end_line=991; end_column=32;
+        start_line=991; start_column=12; end_line=991; end_column=34;
         law_headings=["Tous secteurs"; "Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -28600,7 +28600,7 @@ let calcul_allocation_logement (calcul_allocation_logement_in: CalculAllocationL
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=990; start_column=10; end_line=990; end_column=29;
+           start_line=990; start_column=12; end_line=990; end_column=31;
            law_headings=["Tous secteurs"; "Secteur logement-foyer";
                           "Calcul du montant de l'allocation logement";
                           "Prologue : aides au logement"]} ([||])
@@ -28620,7 +28620,7 @@ let calcul_allocation_logement (calcul_allocation_logement_in: CalculAllocationL
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=990; start_column=10; end_line=990; end_column=29;
+        start_line=990; start_column=12; end_line=990; end_column=31;
         law_headings=["Tous secteurs"; "Secteur logement-foyer";
                        "Calcul du montant de l'allocation logement";
                        "Prologue : aides au logement"]})))) in
@@ -29202,7 +29202,7 @@ let calculette_aides_au_logement (calculette_aides_au_logement_in: CalculetteAid
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=1055; start_column=10; end_line=1055; end_column=59;
+           start_line=1055; start_column=12; end_line=1055; end_column=61;
            law_headings=["Calculette globale";
                           "Prologue : aides au logement"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -29215,14 +29215,14 @@ let calculette_aides_au_logement (calculette_aides_au_logement_in: CalculetteAid
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1055; start_column=10; end_line=1055; end_column=59;
+        start_line=1055; start_column=12; end_line=1055; end_column=61;
         law_headings=["Calculette globale"; "Prologue : aides au logement"]})))) in
   let eligibilite_: bool = (log_variable_definition
     ["CalculetteAidesAuLogement"; "éligibilité"] (embed_bool) (
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=1052; start_column=10; end_line=1052; end_column=21;
+           start_line=1052; start_column=12; end_line=1052; end_column=23;
            law_headings=["Calculette globale";
                           "Prologue : aides au logement"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -29247,7 +29247,7 @@ let calculette_aides_au_logement (calculette_aides_au_logement_in: CalculetteAid
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1052; start_column=10; end_line=1052; end_column=21;
+        start_line=1052; start_column=12; end_line=1052; end_column=23;
         law_headings=["Calculette globale"; "Prologue : aides au logement"]})))) in
   let traitement_aide_finale_: money -> money = (log_variable_definition
     ["CalculetteAidesAuLogement"; "traitement_aide_finale"] (unembeddable) (
@@ -29256,8 +29256,8 @@ let calculette_aides_au_logement (calculette_aides_au_logement_in: CalculetteAid
          try
            (handle_default
               {filename = "examples/aides_logement/prologue.catala_fr";
-                start_line=1054; start_column=10;
-                end_line=1054; end_column=32;
+                start_line=1054; start_column=12;
+                end_line=1054; end_column=34;
                 law_headings=["Calculette globale";
                                "Prologue : aides au logement"]} ([||])
               (fun (_: unit) -> (log_decision_taken
@@ -29319,20 +29319,20 @@ let calculette_aides_au_logement (calculette_aides_au_logement_in: CalculetteAid
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/aides_logement/prologue.catala_fr";
-             start_line=1054; start_column=10; end_line=1054; end_column=32;
+             start_line=1054; start_column=12; end_line=1054; end_column=34;
              law_headings=["Calculette globale";
                             "Prologue : aides au logement"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1054; start_column=10; end_line=1054; end_column=32;
+        start_line=1054; start_column=12; end_line=1054; end_column=34;
         law_headings=["Calculette globale"; "Prologue : aides au logement"]})))) in
   let aide_finale_formule_: money = (log_variable_definition
     ["CalculetteAidesAuLogement"; "aide_finale_formule"] (embed_money) (
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=1053; start_column=10; end_line=1053; end_column=29;
+           start_line=1053; start_column=12; end_line=1053; end_column=31;
            law_headings=["Calculette globale";
                           "Prologue : aides au logement"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -29397,7 +29397,7 @@ let calculette_aides_au_logement (calculette_aides_au_logement_in: CalculetteAid
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1053; start_column=10; end_line=1053; end_column=29;
+        start_line=1053; start_column=12; end_line=1053; end_column=31;
         law_headings=["Calculette globale"; "Prologue : aides au logement"]})))) in
   {CalculetteAidesAuLogement.eligibilite = eligibilite_;
      CalculetteAidesAuLogement.aide_finale_formule = aide_finale_formule_;
@@ -29669,7 +29669,7 @@ let calculette_aides_au_logement_garde_alternee (calculette_aides_au_logement_ga
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=1125; start_column=10; end_line=1125; end_column=21;
+           start_line=1125; start_column=12; end_line=1125; end_column=23;
            law_headings=["Calculette avec garde alternée";
                           "Prologue : aides au logement"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -29681,7 +29681,7 @@ let calculette_aides_au_logement_garde_alternee (calculette_aides_au_logement_ga
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1125; start_column=10; end_line=1125; end_column=21;
+        start_line=1125; start_column=12; end_line=1125; end_column=23;
         law_headings=["Calculette avec garde alternée";
                        "Prologue : aides au logement"]})))) in
   let coefficents_enfants_garde_alternee_pris_en_compte_: decimal array = (log_variable_definition
@@ -29713,7 +29713,7 @@ let calculette_aides_au_logement_garde_alternee (calculette_aides_au_logement_ga
     try
       (handle_default
          {filename = "examples/aides_logement/prologue.catala_fr";
-           start_line=1126; start_column=10; end_line=1126; end_column=21;
+           start_line=1126; start_column=12; end_line=1126; end_column=23;
            law_headings=["Calculette avec garde alternée";
                           "Prologue : aides au logement"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -29753,7 +29753,7 @@ let calculette_aides_au_logement_garde_alternee (calculette_aides_au_logement_ga
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/aides_logement/prologue.catala_fr";
-        start_line=1126; start_column=10; end_line=1126; end_column=21;
+        start_line=1126; start_column=12; end_line=1126; end_column=23;
         law_headings=["Calculette avec garde alternée";
                        "Prologue : aides au logement"]})))) in
   {CalculetteAidesAuLogementGardeAlternee.eligibilite = eligibilite_;
diff --git a/french_law/ocaml/law_source/allocations_familiales.ml b/french_law/ocaml/law_source/allocations_familiales.ml
index dc537848..e03c873d 100644
--- a/french_law/ocaml/law_source/allocations_familiales.ml
+++ b/french_law/ocaml/law_source/allocations_familiales.ml
@@ -366,7 +366,7 @@ let allocation_familiales_avril2008 (allocation_familiales_avril2008_in: Allocat
     try
       (handle_default
          {filename = "examples/allocations_familiales/prologue.catala_fr";
-           start_line=76; start_column=10; end_line=76; end_column=37;
+           start_line=76; start_column=12; end_line=76; end_column=39;
            law_headings=["Allocations familiales"; "Champs d'applications";
                           "Prologue"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -382,7 +382,7 @@ let allocation_familiales_avril2008 (allocation_familiales_avril2008_in: Allocat
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=76; start_column=10; end_line=76; end_column=37;
+        start_line=76; start_column=12; end_line=76; end_column=39;
         law_headings=["Allocations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   {AllocationFamilialesAvril2008.age_minimum_alinea_1_l521_3 =
@@ -395,7 +395,7 @@ let enfant_le_plus_age (enfant_le_plus_age_in: EnfantLePlusAgeIn.t) : EnfantLePl
     try
       (handle_default
          {filename = "examples/allocations_familiales/prologue.catala_fr";
-           start_line=80; start_column=10; end_line=80; end_column=21;
+           start_line=80; start_column=12; end_line=80; end_column=23;
            law_headings=["Allocations familiales"; "Champs d'applications";
                           "Prologue"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -428,7 +428,7 @@ let enfant_le_plus_age (enfant_le_plus_age_in: EnfantLePlusAgeIn.t) : EnfantLePl
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=80; start_column=10; end_line=80; end_column=21;
+        start_line=80; start_column=12; end_line=80; end_column=23;
         law_headings=["Allocations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   {EnfantLePlusAge.le_plus_age = le_plus_age_}
@@ -441,14 +441,14 @@ let smic (smic_in: SmicIn.t) : Smic.t =
     try
       (handle_default
          {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-           start_line=11; start_column=10; end_line=11; end_column=22;
+           start_line=11; start_column=12; end_line=11; end_column=24;
            law_headings=["Prologue";
                           "Montant du salaire minimum de croissance"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -491,8 +491,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -514,8 +514,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -558,8 +558,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -581,8 +581,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -625,8 +625,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -648,8 +648,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -692,8 +692,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -715,8 +715,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -759,8 +759,8 @@ let smic (smic_in: SmicIn.t) : Smic.t =
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-                   start_line=11; start_column=10;
-                   end_line=11; end_column=22;
+                   start_line=11; start_column=12;
+                   end_line=11; end_column=24;
                    law_headings=["Prologue";
                                   "Montant du salaire minimum de croissance"]}
                  ([||])
@@ -783,7 +783,7 @@ let smic (smic_in: SmicIn.t) : Smic.t =
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/../smic/smic.catala_fr";
-        start_line=11; start_column=10; end_line=11; end_column=22;
+        start_line=11; start_column=12; end_line=11; end_column=24;
         law_headings=["Prologue"; "Montant du salaire minimum de croissance"]})))) in
   {Smic.brut_horaire = brut_horaire_}
 
@@ -794,12 +794,12 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
     try
       (handle_default
          {filename = "examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-           start_line=6; start_column=10; end_line=6; end_column=17;
+           start_line=6; start_column=12; end_line=6; end_column=19;
            law_headings=["Montant de la base mensuelle des allocations familiales"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -817,7 +817,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -835,7 +835,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -853,7 +853,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
             (fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-                   start_line=6; start_column=10; end_line=6; end_column=17;
+                   start_line=6; start_column=12; end_line=6; end_column=19;
                    law_headings=["Montant de la base mensuelle des allocations familiales"]}
                  ([||])
                  (fun (_: unit) -> (log_decision_taken
@@ -872,7 +872,7 @@ let base_mensuelle_allocations_familiales (base_mensuelle_allocations_familiales
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr";
-        start_line=6; start_column=10; end_line=6; end_column=17;
+        start_line=6; start_column=12; end_line=6; end_column=19;
         law_headings=["Montant de la base mensuelle des allocations familiales"]})))) in
   {BaseMensuelleAllocationsFamiliales.montant = montant_}
 
@@ -885,7 +885,7 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
     try
       (handle_default
          {filename = "examples/allocations_familiales/prologue.catala_fr";
-           start_line=60; start_column=10; end_line=60; end_column=22;
+           start_line=60; start_column=12; end_line=60; end_column=24;
            law_headings=["Prestations familiales"; "Champs d'applications";
                           "Prologue"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -901,7 +901,7 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=60; start_column=10; end_line=60; end_column=22;
+        start_line=60; start_column=12; end_line=60; end_column=24;
         law_headings=["Prestations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   let smic_dot_date_courante_: date = 
@@ -955,14 +955,14 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
     try
       (handle_default
          {filename = "examples/allocations_familiales/prologue.catala_fr";
-           start_line=61; start_column=10; end_line=61; end_column=33;
+           start_line=61; start_column=12; end_line=61; end_column=35;
            law_headings=["Prestations familiales"; "Champs d'applications";
                           "Prologue"]}
          ([|(fun (_: unit) ->
                handle_default
                  {filename = "examples/allocations_familiales/prologue.catala_fr";
-                   start_line=61; start_column=10;
-                   end_line=61; end_column=33;
+                   start_line=61; start_column=12;
+                   end_line=61; end_column=35;
                    law_headings=["Prestations familiales";
                                   "Champs d'applications"; "Prologue"]}
                  ([||])
@@ -990,14 +990,14 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
                  (fun (_: unit) -> true))|])
          (fun (_: unit) -> (log_decision_taken
             {filename = "examples/allocations_familiales/prologue.catala_fr";
-              start_line=61; start_column=10; end_line=61; end_column=33;
+              start_line=61; start_column=12; end_line=61; end_column=35;
               law_headings=["Prestations familiales";
                              "Champs d'applications"; "Prologue"]} true))
          (fun (_: unit) -> false))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=61; start_column=10; end_line=61; end_column=33;
+        start_line=61; start_column=12; end_line=61; end_column=35;
         law_headings=["Prestations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   let plafond_l512_3_2_: money = (log_variable_definition
@@ -1058,14 +1058,14 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
          try
            (handle_default
               {filename = "examples/allocations_familiales/prologue.catala_fr";
-                start_line=58; start_column=10; end_line=58; end_column=29;
+                start_line=58; start_column=12; end_line=58; end_column=31;
                 law_headings=["Prestations familiales";
                                "Champs d'applications"; "Prologue"]}
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/allocations_familiales/prologue.catala_fr";
-                        start_line=58; start_column=10;
-                        end_line=58; end_column=29;
+                        start_line=58; start_column=12;
+                        end_line=58; end_column=31;
                         law_headings=["Prestations familiales";
                                        "Champs d'applications"; "Prologue"]}
                       ([||])
@@ -1110,21 +1110,21 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
                                plafond_l512_3_2_)))) (fun (_: unit) -> true))|])
               (fun (_: unit) -> (log_decision_taken
                  {filename = "examples/allocations_familiales/prologue.catala_fr";
-                   start_line=58; start_column=10;
-                   end_line=58; end_column=29;
+                   start_line=58; start_column=12;
+                   end_line=58; end_column=31;
                    law_headings=["Prestations familiales";
                                   "Champs d'applications"; "Prologue"]} true))
               (fun (_: unit) -> false))
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/allocations_familiales/prologue.catala_fr";
-             start_line=58; start_column=10; end_line=58; end_column=29;
+             start_line=58; start_column=12; end_line=58; end_column=31;
              law_headings=["Prestations familiales"; "Champs d'applications";
                             "Prologue"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=58; start_column=10; end_line=58; end_column=29;
+        start_line=58; start_column=12; end_line=58; end_column=31;
         law_headings=["Prestations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   let droit_ouvert_: Enfant.t -> bool = (log_variable_definition
@@ -1134,21 +1134,21 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
          try
            (handle_default
               {filename = "examples/allocations_familiales/prologue.catala_fr";
-                start_line=57; start_column=10; end_line=57; end_column=22;
+                start_line=57; start_column=12; end_line=57; end_column=24;
                 law_headings=["Prestations familiales";
                                "Champs d'applications"; "Prologue"]}
               ([|(fun (_: unit) ->
                     handle_default
                       {filename = "examples/allocations_familiales/prologue.catala_fr";
-                        start_line=57; start_column=10;
-                        end_line=57; end_column=22;
+                        start_line=57; start_column=12;
+                        end_line=57; end_column=24;
                         law_headings=["Prestations familiales";
                                        "Champs d'applications"; "Prologue"]}
                       ([|(fun (_: unit) ->
                             handle_default
                               {filename = "examples/allocations_familiales/prologue.catala_fr";
-                                start_line=57; start_column=10;
-                                end_line=57; end_column=22;
+                                start_line=57; start_column=12;
+                                end_line=57; end_column=24;
                                 law_headings=["Prestations familiales";
                                                "Champs d'applications";
                                                "Prologue"]} ([||])
@@ -1170,24 +1170,24 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
                       (fun (_: unit) ->
                          handle_default
                            {filename = "examples/allocations_familiales/prologue.catala_fr";
-                             start_line=57; start_column=10;
-                             end_line=57; end_column=22;
+                             start_line=57; start_column=12;
+                             end_line=57; end_column=24;
                              law_headings=["Prestations familiales";
                                             "Champs d'applications";
                                             "Prologue"]}
                            ([|(fun (_: unit) ->
                                  handle_default
                                    {filename = "examples/allocations_familiales/prologue.catala_fr";
-                                     start_line=57; start_column=10;
-                                     end_line=57; end_column=22;
+                                     start_line=57; start_column=12;
+                                     end_line=57; end_column=24;
                                      law_headings=["Prestations familiales";
                                                     "Champs d'applications";
                                                     "Prologue"]}
                                    ([|(fun (_: unit) ->
                                          handle_default
                                            {filename = "examples/allocations_familiales/prologue.catala_fr";
-                                             start_line=57; start_column=10;
-                                             end_line=57; end_column=22;
+                                             start_line=57; start_column=12;
+                                             end_line=57; end_column=24;
                                              law_headings=["Prestations familiales";
                                                             "Champs d'applications";
                                                             "Prologue"]}
@@ -1258,21 +1258,21 @@ let prestations_familiales (prestations_familiales_in: PrestationsFamilialesIn.t
                            (fun (_: unit) -> raise EmptyError)))|])
               (fun (_: unit) -> (log_decision_taken
                  {filename = "examples/allocations_familiales/prologue.catala_fr";
-                   start_line=57; start_column=10;
-                   end_line=57; end_column=22;
+                   start_line=57; start_column=12;
+                   end_line=57; end_column=24;
                    law_headings=["Prestations familiales";
                                   "Champs d'applications"; "Prologue"]} true))
               (fun (_: unit) -> false))
          with
          EmptyError -> (raise (NoValueProvided
            {filename = "examples/allocations_familiales/prologue.catala_fr";
-             start_line=57; start_column=10; end_line=57; end_column=22;
+             start_line=57; start_column=12; end_line=57; end_column=24;
              law_headings=["Prestations familiales"; "Champs d'applications";
                             "Prologue"]})))
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=57; start_column=10; end_line=57; end_column=22;
+        start_line=57; start_column=12; end_line=57; end_column=24;
         law_headings=["Prestations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   {PrestationsFamiliales.droit_ouvert = droit_ouvert_;
@@ -5119,7 +5119,7 @@ let allocations_familiales (allocations_familiales_in: AllocationsFamilialesIn.t
     try
       (handle_default
          {filename = "examples/allocations_familiales/prologue.catala_fr";
-           start_line=100; start_column=10; end_line=100; end_column=23;
+           start_line=100; start_column=12; end_line=100; end_column=25;
            law_headings=["Allocations familiales"; "Champs d'applications";
                           "Prologue"]} ([||])
          (fun (_: unit) -> (log_decision_taken
@@ -5140,7 +5140,7 @@ let allocations_familiales (allocations_familiales_in: AllocationsFamilialesIn.t
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/prologue.catala_fr";
-        start_line=100; start_column=10; end_line=100; end_column=23;
+        start_line=100; start_column=12; end_line=100; end_column=25;
         law_headings=["Allocations familiales"; "Champs d'applications";
                        "Prologue"]})))) in
   let _: unit = if (
@@ -5424,7 +5424,7 @@ let interface_allocations_familiales (interface_allocations_familiales_in: Inter
     try
       (handle_default
          {filename = "examples/allocations_familiales/epilogue.catala_fr";
-           start_line=79; start_column=10; end_line=79; end_column=25;
+           start_line=79; start_column=12; end_line=79; end_column=27;
            law_headings=["Interface du programme"; "Épilogue"]} ([||])
          (fun (_: unit) -> (log_decision_taken
             {filename = "examples/allocations_familiales/epilogue.catala_fr";
@@ -5434,6 +5434,6 @@ let interface_allocations_familiales (interface_allocations_familiales_in: Inter
     with
     EmptyError -> (raise (NoValueProvided
       {filename = "examples/allocations_familiales/epilogue.catala_fr";
-        start_line=79; start_column=10; end_line=79; end_column=25;
+        start_line=79; start_column=12; end_line=79; end_column=27;
         law_headings=["Interface du programme"; "Épilogue"]})))) in
   {InterfaceAllocationsFamiliales.i_montant_verse = i_montant_verse_}
diff --git a/french_law/python/src/aides_logement.py b/french_law/python/src/aides_logement.py
index 3d3e6610..10bcc41a 100644
--- a/french_law/python/src/aides_logement.py
+++ b/french_law/python/src/aides_logement.py
@@ -2691,17 +2691,17 @@ def contributions_sociales_aides_personnelle_logement(contributions_sociales_aid
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                      start_line=520,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=520,
-                                                     end_column=17,
+                                                     end_column=19,
                                                      law_headings=["Calcul des contributions sociales s'appliquant aux aides personnelles au logement",
                                                      "Déclarations des champs d'application",
                                                      "Prologue : aides au logement"]))
     except EmptyError:
         temp_montant = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=520, start_column=10,
-                                             end_line=520, end_column=17,
+                                             start_line=520, start_column=12,
+                                             end_line=520, end_column=19,
                                              law_headings=["Calcul des contributions sociales s'appliquant aux aides personnelles au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -2891,8 +2891,8 @@ def calcul_equivalence_loyer_minimale(calcul_equivalence_loyer_minimale_in:Calcu
     except EmptyError:
         temp_montant_3 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=596, start_column=10,
-                                             end_line=596, end_column=17,
+                                             start_line=596, start_column=12,
+                                             end_line=596, end_column=19,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -2974,8 +2974,8 @@ def calcul_nombre_part_logement_foyer(calcul_nombre_part_logement_foyer_in:Calcu
     except EmptyError:
         temp_n_nombre_parts_d832_25 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=603, start_column=10,
-                                             end_line=603, end_column=32,
+                                             start_line=603, start_column=12,
+                                             end_line=603, end_column=34,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -3020,8 +3020,8 @@ def calcul_nombre_parts_accession_propriete(calcul_nombre_parts_accession_propri
     except EmptyError:
         temp_n_nombre_parts_d832_11 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=659, start_column=10,
-                                             end_line=659, end_column=32,
+                                             start_line=659, start_column=12,
+                                             end_line=659, end_column=34,
                                              law_headings=["Secteur accession à la propriété",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -3079,8 +3079,8 @@ def ouverture_droits_retraite(ouverture_droits_retraite_in:OuvertureDroitsRetrai
                 raise EmptyError
         temp_age_ouverture_droit_8 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                     start_line=998,
-                                                    start_column=10,
-                                                    end_line=998, end_column=29,
+                                                    start_column=12,
+                                                    end_line=998, end_column=31,
                                                     law_headings=["Date d'ouverture des droits à la retraite",
                                                     "Calcul du montant de l'allocation logement",
                                                     "Prologue : aides au logement"]), [temp_age_ouverture_droit_7,
@@ -3094,8 +3094,8 @@ def ouverture_droits_retraite(ouverture_droits_retraite_in:OuvertureDroitsRetrai
     except EmptyError:
         temp_age_ouverture_droit_8 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=998, start_column=10,
-                                             end_line=998, end_column=29,
+                                             start_line=998, start_column=12,
+                                             end_line=998, end_column=31,
                                              law_headings=["Date d'ouverture des droits à la retraite",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -3449,8 +3449,8 @@ def impaye_depense_logement(impaye_depense_logement_in:ImpayeDepenseLogementIn):
         temp_montant_impaye_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1018,
-                                             start_column=10, end_line=1018,
-                                             end_column=24,
+                                             start_column=12, end_line=1018,
+                                             end_column=26,
                                              law_headings=["Quantification des impayés de dépense de logement",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -3493,8 +3493,8 @@ def base_mensuelle_allocations_familiales(base_mensuelle_allocations_familiales_
             else:
                 raise EmptyError
         temp_montant_12 = handle_default(SourcePosition(filename="examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr",
-                                         start_line=6, start_column=10,
-                                         end_line=6, end_column=17,
+                                         start_line=6, start_column=12,
+                                         end_line=6, end_column=19,
                                          law_headings=["Montant de la base mensuelle des allocations familiales"]), [temp_montant_11,
                                          temp_montant_10, temp_montant_9,
                                          temp_montant_8], temp_montant_7,
@@ -3502,8 +3502,8 @@ def base_mensuelle_allocations_familiales(base_mensuelle_allocations_familiales_
     except EmptyError:
         temp_montant_12 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../base_mensuelle_allocations_familiales/bmaf.catala_fr",
-                                             start_line=6, start_column=10,
-                                             end_line=6, end_column=17,
+                                             start_line=6, start_column=12,
+                                             end_line=6, end_column=19,
                                              law_headings=["Montant de la base mensuelle des allocations familiales"]))
     montant_2 = temp_montant_12
     return BaseMensuelleAllocationsFamiliales(montant = montant_2)
@@ -3652,8 +3652,8 @@ def smic(smic_in:SmicIn):
             else:
                 raise EmptyError
         temp_brut_horaire_12 = handle_default(SourcePosition(filename="examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr",
-                                              start_line=11, start_column=10,
-                                              end_line=11, end_column=22,
+                                              start_line=11, start_column=12,
+                                              end_line=11, end_column=24,
                                               law_headings=["Prologue",
                                               "Montant du salaire minimum de croissance"]), [temp_brut_horaire_11,
                                               temp_brut_horaire_10,
@@ -3670,8 +3670,8 @@ def smic(smic_in:SmicIn):
     except EmptyError:
         temp_brut_horaire_12 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/../smic/smic.catala_fr",
-                                             start_line=11, start_column=10,
-                                             end_line=11, end_column=22,
+                                             start_line=11, start_column=12,
+                                             end_line=11, end_column=24,
                                              law_headings=["Prologue",
                                              "Montant du salaire minimum de croissance"]))
     brut_horaire = temp_brut_horaire_12
@@ -3868,8 +3868,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
     except EmptyError:
         temp_taux_composition_familiale = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=564, start_column=10,
-                                             end_line=564, end_column=36,
+                                             start_line=564, start_column=12,
+                                             end_line=564, end_column=38,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -4372,8 +4372,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                 else:
                     raise EmptyError
             return handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                  start_line=562, start_column=10,
-                                  end_line=562, end_column=33,
+                                  start_line=562, start_column=12,
+                                  end_line=562, end_column=35,
                                   law_headings=["Secteur locatif",
                                   "Calcul du montant de l'aide personnalisée au logement",
                                   "Déclarations des champs d'application",
@@ -4447,8 +4447,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                     else:
                         raise EmptyError
                 return handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                      start_line=562, start_column=10,
-                                      end_line=562, end_column=33,
+                                      start_line=562, start_column=12,
+                                      end_line=562, end_column=35,
                                       law_headings=["Secteur locatif",
                                       "Calcul du montant de l'aide personnalisée au logement",
                                       "Déclarations des champs d'application",
@@ -4510,8 +4510,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                     else:
                         raise EmptyError
                 return handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                      start_line=562, start_column=10,
-                                      end_line=562, end_column=33,
+                                      start_line=562, start_column=12,
+                                      end_line=562, end_column=35,
                                       law_headings=["Secteur locatif",
                                       "Calcul du montant de l'aide personnalisée au logement",
                                       "Déclarations des champs d'application",
@@ -4751,8 +4751,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                 else:
                     raise EmptyError
             return handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                  start_line=562, start_column=10,
-                                  end_line=562, end_column=33,
+                                  start_line=562, start_column=12,
+                                  end_line=562, end_column=35,
                                   law_headings=["Secteur locatif",
                                   "Calcul du montant de l'aide personnalisée au logement",
                                   "Déclarations des champs d'application",
@@ -4769,8 +4769,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                                   temp_plafond_loyer_d823_16_2_31)
         temp_plafond_loyer_d823_16_2_48 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                          start_line=562,
-                                                         start_column=10,
-                                                         end_line=562, end_column=33,
+                                                         start_column=12,
+                                                         end_line=562, end_column=35,
                                                          law_headings=["Secteur locatif",
                                                          "Calcul du montant de l'aide personnalisée au logement",
                                                          "Déclarations des champs d'application",
@@ -4781,8 +4781,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
     except EmptyError:
         temp_plafond_loyer_d823_16_2_48 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=562, start_column=10,
-                                             end_line=562, end_column=33,
+                                             start_line=562, start_column=12,
+                                             end_line=562, end_column=35,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -4843,7 +4843,7 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                     raise EmptyError
             temp_montant_forfaitaire_charges_d823_16_8 = handle_default(
                 SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                start_line=561, start_column=10, end_line=561, end_column=45,
+                start_line=561, start_column=12, end_line=561, end_column=47,
                 law_headings=["Secteur locatif",
                 "Calcul du montant de l'aide personnalisée au logement",
                 "Déclarations des champs d'application",
@@ -4885,7 +4885,7 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                     raise EmptyError
             temp_montant_forfaitaire_charges_d823_16_8 = handle_default(
                 SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                start_line=561, start_column=10, end_line=561, end_column=45,
+                start_line=561, start_column=12, end_line=561, end_column=47,
                 law_headings=["Secteur locatif",
                 "Calcul du montant de l'aide personnalisée au logement",
                 "Déclarations des champs d'application",
@@ -4897,8 +4897,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
     except EmptyError:
         temp_montant_forfaitaire_charges_d823_16_8 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=561, start_column=10,
-                                             end_line=561, end_column=45,
+                                             start_line=561, start_column=12,
+                                             end_line=561, end_column=47,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -5074,8 +5074,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
                 raise EmptyError
         temp_participation_minimale_5 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                        start_line=563,
-                                                       start_column=10,
-                                                       end_line=563, end_column=32,
+                                                       start_column=12,
+                                                       end_line=563, end_column=34,
                                                        law_headings=["Secteur locatif",
                                                        "Calcul du montant de l'aide personnalisée au logement",
                                                        "Déclarations des champs d'application",
@@ -5087,8 +5087,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
     except EmptyError:
         temp_participation_minimale_5 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=563, start_column=10,
-                                             end_line=563, end_column=32,
+                                             start_line=563, start_column=12,
+                                             end_line=563, end_column=34,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -5426,8 +5426,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
     except EmptyError:
         temp_participation_personnelle_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=565, start_column=10,
-                                             end_line=565, end_column=35,
+                                             start_line=565, start_column=12,
+                                             end_line=565, end_column=37,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -5445,8 +5445,8 @@ def calcul_aide_personnalisee_logement_locatif(calcul_aide_personnalisee_logemen
     except EmptyError:
         temp_aide_finale_formule = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=570, start_column=10,
-                                             end_line=570, end_column=29,
+                                             start_line=570, start_column=12,
+                                             end_line=570, end_column=31,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -5531,8 +5531,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_coefficient_r_d832_25 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=618, start_column=10,
-                                             end_line=618, end_column=31,
+                                             start_line=618, start_column=12,
+                                             end_line=618, end_column=33,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -5884,8 +5884,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
                 raise EmptyError
         temp_plafond_equivalence_loyer_eligible_5 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                                    start_line=621,
-                                                                   start_column=10,
-                                                                   end_line=621, end_column=44,
+                                                                   start_column=12,
+                                                                   end_line=621, end_column=46,
                                                                    law_headings=["Secteur logement-foyer",
                                                                    "Calcul du montant de l'aide personnalisée au logement",
                                                                    "Déclarations des champs d'application",
@@ -5897,8 +5897,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_plafond_equivalence_loyer_eligible_5 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=621, start_column=10,
-                                             end_line=621, end_column=44,
+                                             start_line=621, start_column=12,
+                                             end_line=621, end_column=46,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -6010,8 +6010,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_coefficient_multiplicateur_d832_25 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=617, start_column=10,
-                                             end_line=617, end_column=44,
+                                             start_line=617, start_column=12,
+                                             end_line=617, end_column=46,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -6026,8 +6026,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_equivalence_loyer_eligible = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=620, start_column=10,
-                                             end_line=620, end_column=36,
+                                             start_line=620, start_column=12,
+                                             end_line=620, end_column=38,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -6041,8 +6041,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_n_nombre_parts_d832_25_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=619, start_column=19,
-                                             end_line=619, end_column=41,
+                                             start_line=619, start_column=21,
+                                             end_line=619, end_column=43,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -6193,8 +6193,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_equivalence_loyer_minimale = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=628, start_column=10,
-                                             end_line=628, end_column=36,
+                                             start_line=628, start_column=12,
+                                             end_line=628, end_column=38,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -6336,8 +6336,8 @@ def calcul_aide_personnalisee_logement_foyer(calcul_aide_personnalisee_logement_
     except EmptyError:
         temp_aide_finale_formule_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=641, start_column=10,
-                                             end_line=641, end_column=29,
+                                             start_line=641, start_column=12,
+                                             end_line=641, end_column=31,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -10499,8 +10499,8 @@ def calcul_aide_personnalisee_logement_accession_propriete(calcul_aide_personnal
                 raise EmptyError
         temp_mensualite_minimale_9 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                     start_line=680,
-                                                    start_column=10,
-                                                    end_line=680, end_column=29,
+                                                    start_column=12,
+                                                    end_line=680, end_column=31,
                                                     law_headings=["Secteur accession à la propriété",
                                                     "Calcul du montant de l'aide personnalisée au logement",
                                                     "Déclarations des champs d'application",
@@ -10511,8 +10511,8 @@ def calcul_aide_personnalisee_logement_accession_propriete(calcul_aide_personnal
     except EmptyError:
         temp_mensualite_minimale_9 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=680, start_column=10,
-                                             end_line=680, end_column=29,
+                                             start_line=680, start_column=12,
+                                             end_line=680, end_column=31,
                                              law_headings=["Secteur accession à la propriété",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -10575,8 +10575,8 @@ def calcul_aide_personnalisee_logement_accession_propriete(calcul_aide_personnal
     except EmptyError:
         temp_mensualite_eligible = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=679, start_column=10,
-                                             end_line=679, end_column=29,
+                                             start_line=679, start_column=12,
+                                             end_line=679, end_column=31,
                                              law_headings=["Secteur accession à la propriété",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -10651,8 +10651,8 @@ def calcul_aide_personnalisee_logement_accession_propriete(calcul_aide_personnal
     except EmptyError:
         temp_aide_finale_formule_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=711, start_column=10,
-                                             end_line=711, end_column=29,
+                                             start_line=711, start_column=12,
+                                             end_line=711, end_column=31,
                                              law_headings=["Secteur accession à la propriété",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -11314,8 +11314,8 @@ def eligibilite_aides_personnelle_logement(eligibilite_aides_personnelle_logemen
     except EmptyError:
         temp_eligibilite = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=320, start_column=10,
-                                             end_line=320, end_column=21,
+                                             start_line=320, start_column=12,
+                                             end_line=320, end_column=23,
                                              law_headings=["Éligibilité aux aides personnelles au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -11352,17 +11352,17 @@ def eligibilite_aides_personnelle_logement(eligibilite_aides_personnelle_logemen
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                      start_line=324,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=324,
-                                                     end_column=28,
+                                                     end_column=30,
                                                      law_headings=["Éligibilité aux aides personnelles au logement",
                                                      "Déclarations des champs d'application",
                                                      "Prologue : aides au logement"]))
     except EmptyError:
         temp_condition_2_r823_4 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=324, start_column=10,
-                                             end_line=324, end_column=28,
+                                             start_line=324, start_column=12,
+                                             end_line=324, end_column=30,
                                              law_headings=["Éligibilité aux aides personnelles au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -11484,8 +11484,8 @@ def eligibilite_aides_personnelle_logement(eligibilite_aides_personnelle_logemen
     except EmptyError:
         temp_coefficents_enfants_garde_alternee_pris_en_compte_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=322, start_column=10,
-                                             end_line=322, end_column=59,
+                                             start_line=322, start_column=12,
+                                             end_line=322, end_column=61,
                                              law_headings=["Éligibilité aux aides personnelles au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -11495,8 +11495,8 @@ def eligibilite_aides_personnelle_logement(eligibilite_aides_personnelle_logemen
     except EmptyError:
         temp_nombre_personnes_a_charge_prises_en_compte = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=321, start_column=10,
-                                             end_line=321, end_column=52,
+                                             start_line=321, start_column=12,
+                                             end_line=321, end_column=54,
                                              law_headings=["Éligibilité aux aides personnelles au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -11752,8 +11752,8 @@ def ressources_aides_personnelle_logement(ressources_aides_personnelle_logement_
     except EmptyError:
         temp_ressources_prises_en_compte_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=508, start_column=10,
-                                             end_line=508, end_column=37,
+                                             start_line=508, start_column=12,
+                                             end_line=508, end_column=39,
                                              law_headings=["Prise en compte des ressources pour les aides personnelles au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -11819,8 +11819,8 @@ def eligibilite_prestations_familiales(eligibilite_prestations_familiales_in:Eli
     except EmptyError:
         temp_age_l512_3_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/prologue.catala_fr",
-                                             start_line=43, start_column=10,
-                                             end_line=43, end_column=22,
+                                             start_line=43, start_column=12,
+                                             end_line=43, end_column=24,
                                              law_headings=["Prologue : prestations familiales"]))
     age_l512_3_2 = temp_age_l512_3_2
     try:
@@ -11865,8 +11865,8 @@ def eligibilite_prestations_familiales(eligibilite_prestations_familiales_in:Eli
     except EmptyError:
         temp_regime_outre_mer_l751_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/prologue.catala_fr",
-                                             start_line=44, start_column=10,
-                                             end_line=44, end_column=33,
+                                             start_line=44, start_column=12,
+                                             end_line=44, end_column=35,
                                              law_headings=["Prologue : prestations familiales"]))
     regime_outre_mer_l751_1 = temp_regime_outre_mer_l751_1
     try:
@@ -11934,15 +11934,15 @@ def eligibilite_prestations_familiales(eligibilite_prestations_familiales_in:Eli
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/prologue.catala_fr",
                                                      start_line=41,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=41,
-                                                     end_column=29,
+                                                     end_column=31,
                                                      law_headings=["Prologue : prestations familiales"]))
     except EmptyError:
         temp_conditions_hors_age = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/prologue.catala_fr",
-                                             start_line=41, start_column=10,
-                                             end_line=41, end_column=29,
+                                             start_line=41, start_column=12,
+                                             end_line=41, end_column=31,
                                              law_headings=["Prologue : prestations familiales"]))
     conditions_hors_age = temp_conditions_hors_age
     try:
@@ -11999,15 +11999,15 @@ def eligibilite_prestations_familiales(eligibilite_prestations_familiales_in:Eli
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/prologue.catala_fr",
                                                      start_line=40,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=40,
-                                                     end_column=22,
+                                                     end_column=24,
                                                      law_headings=["Prologue : prestations familiales"]))
     except EmptyError:
         temp_droit_ouvert = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/../prestations_familiales/prologue.catala_fr",
-                                             start_line=40, start_column=10,
-                                             end_line=40, end_column=22,
+                                             start_line=40, start_column=12,
+                                             end_line=40, end_column=24,
                                              law_headings=["Prologue : prestations familiales"]))
     droit_ouvert = temp_droit_ouvert
     return EligibilitePrestationsFamiliales(droit_ouvert = droit_ouvert,
@@ -12215,17 +12215,17 @@ def calcul_allocation_logement_locatif(calcul_allocation_logement_locatif_in:Cal
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                      start_line=788,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=788,
-                                                     end_column=32,
+                                                     end_column=34,
                                                      law_headings=["Secteur locatif",
                                                      "Calcul du montant de l'allocation logement",
                                                      "Prologue : aides au logement"]))
     except EmptyError:
         temp_traitement_aide_finale = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=788, start_column=10,
-                                             end_line=788, end_column=32,
+                                             start_line=788, start_column=12,
+                                             end_line=788, end_column=34,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -12258,8 +12258,8 @@ def calcul_allocation_logement_locatif(calcul_allocation_logement_locatif_in:Cal
     except EmptyError:
         temp_aide_finale_formule_4 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=786, start_column=10,
-                                             end_line=786, end_column=29,
+                                             start_line=786, start_column=12,
+                                             end_line=786, end_column=31,
                                              law_headings=["Secteur locatif",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -12522,8 +12522,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
                 raise EmptyError
         temp_montant_forfaitaire_charges_4 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                             start_line=932,
-                                                            start_column=10,
-                                                            end_line=932, end_column=37,
+                                                            start_column=12,
+                                                            end_line=932, end_column=39,
                                                             law_headings=["Secteur logement-foyer",
                                                             "Calcul du montant de l'allocation logement",
                                                             "Prologue : aides au logement"]), [temp_montant_forfaitaire_charges_3,
@@ -12533,8 +12533,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
     except EmptyError:
         temp_montant_forfaitaire_charges_4 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=932, start_column=10,
-                                             end_line=932, end_column=37,
+                                             start_line=932, start_column=12,
+                                             end_line=932, end_column=39,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -12752,8 +12752,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
                 raise EmptyError
         temp_equivalence_loyer_16 = handle_default(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                    start_line=931,
-                                                   start_column=10,
-                                                   end_line=931, end_column=27,
+                                                   start_column=12,
+                                                   end_line=931, end_column=29,
                                                    law_headings=["Secteur logement-foyer",
                                                    "Calcul du montant de l'allocation logement",
                                                    "Prologue : aides au logement"]), [temp_equivalence_loyer_14,
@@ -12767,8 +12767,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
     except EmptyError:
         temp_equivalence_loyer_16 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=931, start_column=10,
-                                             end_line=931, end_column=27,
+                                             start_line=931, start_column=12,
+                                             end_line=931, end_column=29,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -12856,8 +12856,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
     except EmptyError:
         temp_coefficient_prise_en_charge = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=930, start_column=10,
-                                             end_line=930, end_column=37,
+                                             start_line=930, start_column=12,
+                                             end_line=930, end_column=39,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -12890,8 +12890,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
     except EmptyError:
         temp_loyer_minimal = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=933, start_column=10,
-                                             end_line=933, end_column=23,
+                                             start_line=933, start_column=12,
+                                             end_line=933, end_column=25,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -12930,8 +12930,8 @@ def calcul_allocation_logement_foyer(calcul_allocation_logement_foyer_in:CalculA
     except EmptyError:
         temp_aide_finale_formule_5 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=943, start_column=10,
-                                             end_line=943, end_column=29,
+                                             start_line=943, start_column=12,
+                                             end_line=943, end_column=31,
                                              law_headings=["Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -16452,8 +16452,8 @@ def calcul_allocation_logement_accession_propriete(calcul_allocation_logement_ac
     except EmptyError:
         temp_aide_finale_formule_6 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=876, start_column=10,
-                                             end_line=876, end_column=29,
+                                             start_line=876, start_column=12,
+                                             end_line=876, end_column=31,
                                              law_headings=["Secteur accession à la propriété",
                                              "Calcul du montant de l'allocation logement",
                                              "Prologue : aides au logement"]))
@@ -17899,9 +17899,9 @@ def calcul_aide_personnalisee_logement(calcul_aide_personnalisee_logement_in:Cal
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                      start_line=746,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=746,
-                                                     end_column=32,
+                                                     end_column=34,
                                                      law_headings=["Tous secteurs",
                                                      "Calcul du montant de l'aide personnalisée au logement",
                                                      "Déclarations des champs d'application",
@@ -17909,8 +17909,8 @@ def calcul_aide_personnalisee_logement(calcul_aide_personnalisee_logement_in:Cal
     except EmptyError:
         temp_traitement_aide_finale_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=746, start_column=10,
-                                             end_line=746, end_column=32,
+                                             start_line=746, start_column=12,
+                                             end_line=746, end_column=34,
                                              law_headings=["Tous secteurs",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -17921,8 +17921,8 @@ def calcul_aide_personnalisee_logement(calcul_aide_personnalisee_logement_in:Cal
     except EmptyError:
         temp_aide_finale_formule_7 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=745, start_column=10,
-                                             end_line=745, end_column=29,
+                                             start_line=745, start_column=12,
+                                             end_line=745, end_column=31,
                                              law_headings=["Tous secteurs",
                                              "Calcul du montant de l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
@@ -18163,8 +18163,8 @@ def eligibilite_prime_de_demenagement(eligibilite_prime_de_demenagement_in:Eligi
     except EmptyError:
         temp_montant_prime_demenagement = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=464, start_column=10,
-                                             end_line=464, end_column=36,
+                                             start_line=464, start_column=12,
+                                             end_line=464, end_column=38,
                                              law_headings=["Éligibilité à la prime de déménagement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -18594,8 +18594,8 @@ def eligibilite_aide_personnalisee_logement(eligibilite_aide_personnalisee_logem
     except EmptyError:
         temp_coefficents_enfants_garde_alternee_pris_en_compte_3 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=372, start_column=10,
-                                             end_line=372, end_column=59,
+                                             start_line=372, start_column=12,
+                                             end_line=372, end_column=61,
                                              law_headings=["Éligibilité à l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -18605,8 +18605,8 @@ def eligibilite_aide_personnalisee_logement(eligibilite_aide_personnalisee_logem
     except EmptyError:
         temp_nombre_personnes_a_charge_prises_en_compte_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=371, start_column=10,
-                                             end_line=371, end_column=52,
+                                             start_line=371, start_column=12,
+                                             end_line=371, end_column=54,
                                              law_headings=["Éligibilité à l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -18624,8 +18624,8 @@ def eligibilite_aide_personnalisee_logement(eligibilite_aide_personnalisee_logem
     except EmptyError:
         temp_eligibilite_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=370, start_column=10,
-                                             end_line=370, end_column=21,
+                                             start_line=370, start_column=12,
+                                             end_line=370, end_column=23,
                                              law_headings=["Éligibilité à l'aide personnalisée au logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -18969,8 +18969,8 @@ def eligibilite_allocation_logement(eligibilite_allocation_logement_in:Eligibili
     except EmptyError:
         temp_coefficents_enfants_garde_alternee_pris_en_compte_4 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=414, start_column=10,
-                                             end_line=414, end_column=59,
+                                             start_line=414, start_column=12,
+                                             end_line=414, end_column=61,
                                              law_headings=["Éligibilité aux allocations de logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -18980,8 +18980,8 @@ def eligibilite_allocation_logement(eligibilite_allocation_logement_in:Eligibili
     except EmptyError:
         temp_nombre_personnes_a_charge_prises_en_compte_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=413, start_column=10,
-                                             end_line=413, end_column=52,
+                                             start_line=413, start_column=12,
+                                             end_line=413, end_column=54,
                                              law_headings=["Éligibilité aux allocations de logement",
                                              "Déclarations des champs d'application",
                                              "Prologue : aides au logement"]))
@@ -21578,9 +21578,9 @@ def calcul_allocation_logement(calcul_allocation_logement_in:CalculAllocationLog
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                      start_line=991,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=991,
-                                                     end_column=32,
+                                                     end_column=34,
                                                      law_headings=["Tous secteurs",
                                                      "Secteur logement-foyer",
                                                      "Calcul du montant de l'allocation logement",
@@ -21588,8 +21588,8 @@ def calcul_allocation_logement(calcul_allocation_logement_in:CalculAllocationLog
     except EmptyError:
         temp_traitement_aide_finale_3 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=991, start_column=10,
-                                             end_line=991, end_column=32,
+                                             start_line=991, start_column=12,
+                                             end_line=991, end_column=34,
                                              law_headings=["Tous secteurs",
                                              "Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
@@ -21600,8 +21600,8 @@ def calcul_allocation_logement(calcul_allocation_logement_in:CalculAllocationLog
     except EmptyError:
         temp_aide_finale_formule_8 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
-                                             start_line=990, start_column=10,
-                                             end_line=990, end_column=29,
+                                             start_line=990, start_column=12,
+                                             end_line=990, end_column=31,
                                              law_headings=["Tous secteurs",
                                              "Secteur logement-foyer",
                                              "Calcul du montant de l'allocation logement",
@@ -21908,8 +21908,8 @@ def calculette_aides_au_logement(calculette_aides_au_logement_in:CalculetteAides
         temp_coefficents_enfants_garde_alternee_pris_en_compte_5 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1055,
-                                             start_column=10, end_line=1055,
-                                             end_column=59,
+                                             start_column=12, end_line=1055,
+                                             end_column=61,
                                              law_headings=["Calculette globale",
                                              "Prologue : aides au logement"]))
     coefficents_enfants_garde_alternee_pris_en_compte_3 = temp_coefficents_enfants_garde_alternee_pris_en_compte_5
@@ -21930,8 +21930,8 @@ def calculette_aides_au_logement(calculette_aides_au_logement_in:CalculetteAides
         temp_eligibilite_3 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1052,
-                                             start_column=10, end_line=1052,
-                                             end_column=21,
+                                             start_column=12, end_line=1052,
+                                             end_column=23,
                                              law_headings=["Calculette globale",
                                              "Prologue : aides au logement"]))
     eligibilite_2 = temp_eligibilite_3
@@ -21972,17 +21972,17 @@ def calculette_aides_au_logement(calculette_aides_au_logement_in:CalculetteAides
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                                      start_line=1054,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=1054,
-                                                     end_column=32,
+                                                     end_column=34,
                                                      law_headings=["Calculette globale",
                                                      "Prologue : aides au logement"]))
     except EmptyError:
         temp_traitement_aide_finale_4 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1054,
-                                             start_column=10, end_line=1054,
-                                             end_column=32,
+                                             start_column=12, end_line=1054,
+                                             end_column=34,
                                              law_headings=["Calculette globale",
                                              "Prologue : aides au logement"]))
     traitement_aide_finale_3 = temp_traitement_aide_finale_4
@@ -22018,8 +22018,8 @@ def calculette_aides_au_logement(calculette_aides_au_logement_in:CalculetteAides
         temp_aide_finale_formule_9 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1053,
-                                             start_column=10, end_line=1053,
-                                             end_column=29,
+                                             start_column=12, end_line=1053,
+                                             end_column=31,
                                              law_headings=["Calculette globale",
                                              "Prologue : aides au logement"]))
     aide_finale_formule_8 = temp_aide_finale_formule_9
@@ -22174,8 +22174,8 @@ def calculette_aides_au_logement_garde_alternee(calculette_aides_au_logement_gar
         temp_eligibilite_4 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1125,
-                                             start_column=10, end_line=1125,
-                                             end_column=21,
+                                             start_column=12, end_line=1125,
+                                             end_column=23,
                                              law_headings=["Calculette avec garde alternée",
                                              "Prologue : aides au logement"]))
     eligibilite_3 = temp_eligibilite_4
@@ -22208,8 +22208,8 @@ def calculette_aides_au_logement_garde_alternee(calculette_aides_au_logement_gar
         temp_aide_finale_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/aides_logement/prologue.catala_fr",
                                              start_line=1126,
-                                             start_column=10, end_line=1126,
-                                             end_column=21,
+                                             start_column=12, end_line=1126,
+                                             end_column=23,
                                              law_headings=["Calculette avec garde alternée",
                                              "Prologue : aides au logement"]))
     aide_finale = temp_aide_finale_2
diff --git a/french_law/python/src/allocations_familiales.py b/french_law/python/src/allocations_familiales.py
index 84aae7de..847b1c2d 100644
--- a/french_law/python/src/allocations_familiales.py
+++ b/french_law/python/src/allocations_familiales.py
@@ -503,8 +503,8 @@ def allocation_familiales_avril2008(allocation_familiales_avril2008_in:Allocatio
     except EmptyError:
         temp_age_minimum_alinea_1_l521_3 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=76, start_column=10,
-                                             end_line=76, end_column=37,
+                                             start_line=76, start_column=12,
+                                             end_line=76, end_column=39,
                                              law_headings=["Allocations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -533,8 +533,8 @@ def enfant_le_plus_age(enfant_le_plus_age_in:EnfantLePlusAgeIn):
     except EmptyError:
         temp_le_plus_age_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=80, start_column=10,
-                                             end_line=80, end_column=21,
+                                             start_line=80, start_column=12,
+                                             end_line=80, end_column=23,
                                              law_headings=["Allocations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -685,8 +685,8 @@ def smic(smic_in:SmicIn):
             else:
                 raise EmptyError
         temp_brut_horaire_12 = handle_default(SourcePosition(filename="examples/allocations_familiales/../smic/smic.catala_fr",
-                                              start_line=11, start_column=10,
-                                              end_line=11, end_column=22,
+                                              start_line=11, start_column=12,
+                                              end_line=11, end_column=24,
                                               law_headings=["Prologue",
                                               "Montant du salaire minimum de croissance"]), [temp_brut_horaire_11,
                                               temp_brut_horaire_10,
@@ -703,8 +703,8 @@ def smic(smic_in:SmicIn):
     except EmptyError:
         temp_brut_horaire_12 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/../smic/smic.catala_fr",
-                                             start_line=11, start_column=10,
-                                             end_line=11, end_column=22,
+                                             start_line=11, start_column=12,
+                                             end_line=11, end_column=24,
                                              law_headings=["Prologue",
                                              "Montant du salaire minimum de croissance"]))
     brut_horaire = temp_brut_horaire_12
@@ -746,8 +746,8 @@ def base_mensuelle_allocations_familiales(base_mensuelle_allocations_familiales_
             else:
                 raise EmptyError
         temp_montant_6 = handle_default(SourcePosition(filename="examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr",
-                                        start_line=6, start_column=10,
-                                        end_line=6, end_column=17,
+                                        start_line=6, start_column=12,
+                                        end_line=6, end_column=19,
                                         law_headings=["Montant de la base mensuelle des allocations familiales"]), [temp_montant_5,
                                         temp_montant_4, temp_montant_3,
                                         temp_montant_2], temp_montant_1,
@@ -755,8 +755,8 @@ def base_mensuelle_allocations_familiales(base_mensuelle_allocations_familiales_
     except EmptyError:
         temp_montant_6 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/../base_mensuelle_allocations_familiales/bmaf.catala_fr",
-                                             start_line=6, start_column=10,
-                                             end_line=6, end_column=17,
+                                             start_line=6, start_column=12,
+                                             end_line=6, end_column=19,
                                              law_headings=["Montant de la base mensuelle des allocations familiales"]))
     montant = temp_montant_6
     return BaseMensuelleAllocationsFamiliales(montant = montant)
@@ -770,8 +770,8 @@ def prestations_familiales(prestations_familiales_in:PrestationsFamilialesIn):
     except EmptyError:
         temp_age_l512_3_2 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=60, start_column=10,
-                                             end_line=60, end_column=22,
+                                             start_line=60, start_column=12,
+                                             end_line=60, end_column=24,
                                              law_headings=["Prestations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -822,8 +822,8 @@ def prestations_familiales(prestations_familiales_in:PrestationsFamilialesIn):
     except EmptyError:
         temp_regime_outre_mer_l751_1 = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=61, start_column=10,
-                                             end_line=61, end_column=33,
+                                             start_line=61, start_column=12,
+                                             end_line=61, end_column=35,
                                              law_headings=["Prestations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -895,17 +895,17 @@ def prestations_familiales(prestations_familiales_in:PrestationsFamilialesIn):
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
                                                      start_line=58,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=58,
-                                                     end_column=29,
+                                                     end_column=31,
                                                      law_headings=["Prestations familiales",
                                                      "Champs d'applications",
                                                      "Prologue"]))
     except EmptyError:
         temp_conditions_hors_age = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=58, start_column=10,
-                                             end_line=58, end_column=29,
+                                             start_line=58, start_column=12,
+                                             end_line=58, end_column=31,
                                              law_headings=["Prestations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -970,17 +970,17 @@ def prestations_familiales(prestations_familiales_in:PrestationsFamilialesIn):
             except EmptyError:
                 raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
                                                      start_line=57,
-                                                     start_column=10,
+                                                     start_column=12,
                                                      end_line=57,
-                                                     end_column=22,
+                                                     end_column=24,
                                                      law_headings=["Prestations familiales",
                                                      "Champs d'applications",
                                                      "Prologue"]))
     except EmptyError:
         temp_droit_ouvert = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=57, start_column=10,
-                                             end_line=57, end_column=22,
+                                             start_line=57, start_column=12,
+                                             end_line=57, end_column=24,
                                              law_headings=["Prestations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -2927,8 +2927,8 @@ def allocations_familiales(allocations_familiales_in:AllocationsFamilialesIn):
     except EmptyError:
         temp_montant_verse = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/prologue.catala_fr",
-                                             start_line=100, start_column=10,
-                                             end_line=100, end_column=23,
+                                             start_line=100, start_column=12,
+                                             end_line=100, end_column=25,
                                              law_headings=["Allocations familiales",
                                              "Champs d'applications",
                                              "Prologue"]))
@@ -3107,8 +3107,8 @@ def interface_allocations_familiales(interface_allocations_familiales_in:Interfa
     except EmptyError:
         temp_i_montant_verse = dead_value
         raise NoValueProvided(SourcePosition(filename="examples/allocations_familiales/epilogue.catala_fr",
-                                             start_line=79, start_column=10,
-                                             end_line=79, end_column=25,
+                                             start_line=79, start_column=12,
+                                             end_line=79, end_column=27,
                                              law_headings=["Interface du programme",
                                              "Épilogue"]))
     i_montant_verse = temp_i_montant_verse
diff --git a/tests/test_scope/bad/scope_call_duplicate.catala_en b/tests/test_scope/bad/scope_call_duplicate.catala_en
index 012a7081..a1019dde 100644
--- a/tests/test_scope/bad/scope_call_duplicate.catala_en
+++ b/tests/test_scope/bad/scope_call_duplicate.catala_en
@@ -11,17 +11,17 @@ scope Toto:
 declaration scope Titi:
   output fizz content Toto
 scope Titi:
-  definition fizz equals Toto of {--bar: 1 --baz: 2.1 -- bar: 3}
+  definition fizz equals output of Toto with {--bar: 1 --baz: 2.1 -- bar: 3}
 ```
 
 ```catala-test-inline
 $ catala dcalc -s Titi
 [ERROR] Duplicate definition of scope input variable 'bar'
 
-┌─⯈ tests/test_scope/bad/scope_call_duplicate.catala_en:14.57-60:
+┌─⯈ tests/test_scope/bad/scope_call_duplicate.catala_en:14.69-72:
 └──┐
-14 │   definition fizz equals Toto of {--bar: 1 --baz: 2.1 -- bar: 3}
-   │                                                          ‾‾‾
+14 │   definition fizz equals output of Toto with {--bar: 1 --baz: 2.1 -- bar: 3}
+   │                                                                      ‾‾‾
 
 #return code 255#
 ```
diff --git a/tests/test_scope/bad/scope_call_extra.catala_en b/tests/test_scope/bad/scope_call_extra.catala_en
index d97b2a4e..a382300a 100644
--- a/tests/test_scope/bad/scope_call_extra.catala_en
+++ b/tests/test_scope/bad/scope_call_extra.catala_en
@@ -11,17 +11,17 @@ scope Toto:
 declaration scope Titi:
   output fizz content Toto
 scope Titi:
-  definition fizz equals Toto of {--biz: 1}
+  definition fizz equals output of Toto with {--biz: 1}
 ```
 
 ```catala-test-inline
 $ catala dcalc -s Titi
 [ERROR] Scope Toto has no input variable biz
 
-┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:14.36-39:
+┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:14.48-51:
 └──┐
-14 │   definition fizz equals Toto of {--biz: 1}
-   │                                     ‾‾‾
+14 │   definition fizz equals output of Toto with {--biz: 1}
+   │                                                 ‾‾‾
 
 
 Scope Toto declared here
diff --git a/tests/test_scope/bad/scope_call_missing.catala_en b/tests/test_scope/bad/scope_call_missing.catala_en
index d60a180a..b857f0e8 100644
--- a/tests/test_scope/bad/scope_call_missing.catala_en
+++ b/tests/test_scope/bad/scope_call_missing.catala_en
@@ -11,17 +11,17 @@ scope Toto:
 declaration scope Titi:
   output fizz content Toto
 scope Titi:
-  definition fizz equals Toto of {--bar: 1}
+  definition fizz equals output of Toto with {--bar: 1}
 ```
 
 ```catala-test-inline
 $ catala dcalc -s Titi
 [ERROR] Definition of input variable 'baz' missing in this scope call
 
-┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:14.25-43:
+┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:14.25-55:
 └──┐
-14 │   definition fizz equals Toto of {--bar: 1}
-   │                          ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
+14 │   definition fizz equals output of Toto with {--bar: 1}
+   │                          ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
 
 Declaration of the missing input variable
diff --git a/tests/test_scope/good/scope_call.catala_en b/tests/test_scope/good/scope_call.catala_en
index fcf8ed2a..8fe9b35f 100644
--- a/tests/test_scope/good/scope_call.catala_en
+++ b/tests/test_scope/good/scope_call.catala_en
@@ -19,8 +19,8 @@ scope SubFoo:
 scope Foo:
   definition example equals
     if true or false then
-      let results_foo equals SubFoo of { -- x: 1 -- y: 2 } in
-      results_foo.z1 + 1 * (SubFoo of { -- x: 10 -- y: 20 }).z2
+      let results_foo equals output of SubFoo with { -- x: 1 -- y: 2 } in
+      results_foo.z1 + 1 * (output of SubFoo with { -- x: 10 -- y: 20 }).z2
     else 0
 ```
 
diff --git a/tests/test_scope/good/scope_call2.catala_en b/tests/test_scope/good/scope_call2.catala_en
index 79791b41..59300751 100644
--- a/tests/test_scope/good/scope_call2.catala_en
+++ b/tests/test_scope/good/scope_call2.catala_en
@@ -14,8 +14,8 @@ declaration scope Titi:
 
 scope Titi:
   definition toto.bar equals 44
-  definition fizz equals Toto of {}
-  definition fuzz equals Toto of {--bar: 111}
+  definition fizz equals output of Toto
+  definition fuzz equals output of Toto with {--bar: 111}
 ```
 
 ```catala-test-inline