diff --git a/Text/Yaml/Reference.bnf b/Text/Yaml/Reference.bnf
--- a/Text/Yaml/Reference.bnf
+++ b/Text/Yaml/Reference.bnf
@@ -384,7 +384,7 @@
                             & ( s_separate n c ?)
                             & ( ns_s_flow_seq_entries n c ?) ?)
 
-ns_flow_seq_entry n c = "pair" ^ ( ns_flow_map_single_pair n c / "node" ^ ns_flow_node n c )
+ns_flow_seq_entry n c = "pair" ^ ( ns_flow_pair n c / "node" ^ ns_flow_node n c )
 
 -- Flow mapping:
 
@@ -400,27 +400,26 @@
                           & ( c_collect_entry
                             & ( s_separate n c ?)
                             & ( ns_s_flow_map_entries n c ?) ?)
+ns_flow_map_entry   n c = nest BeginPair
+                            & "key"
+                            ^ ( c_mapping_key ! "key" & s_separate n c & ns_flow_map_explicit_entry n c
+                              / ns_flow_map_implicit_entry n c )
+                            & nest EndPair
 
-ns_flow_map_entry n c = nest BeginPair
-                      & "pair"
-                      ^ ( c_mapping_key ! "pair" & s_ns_flow_map_explicit_entry n c
-                        / ns_flow_map_implicit_entry n c )
-                      & nest EndPair
+ns_flow_map_explicit_entry n c = ns_flow_map_implicit_entry n c
+                               / e_node & e_node
+ns_flow_map_implicit_entry n c = "pair"
+                               ^ ( c_ns_flow_map_json_key_entry n c
+                                 / ns_flow_map_yaml_key_entry n c
+                                 / ns_flow_map_empty_key_entry n c )
 
-s_ns_flow_map_explicit_entry n c = "entry"
-                                 ^ ( s_ns_flow_map_explicit_json n c
-                                   / s_ns_flow_map_explicit_yaml n c
-                                   / s_ns_flow_map_explicit_empty n c
-                                   / e_node & e_node )
-s_ns_flow_map_explicit_json  n c = s_separate n c
-                                 & ( "node" ^ c_flow_json_node n c ) ! "entry"
+c_ns_flow_map_json_key_entry n c = ( "node" ^ c_flow_json_node n c ) ! "pair"
                                  & ( ( s_separate n c ?) & c_ns_flow_map_adjacent_value n c
                                    / e_node )
-s_ns_flow_map_explicit_yaml  n c = s_separate n c
-                                 & ( "node" ^ ns_flow_yaml_node n c ) ! "entry"
+ns_flow_map_yaml_key_entry   n c = ( "node" ^ ns_flow_yaml_node n c ) ! "pair"
                                  & ( ( s_separate n c ?) & c_ns_flow_map_separate_value n c
                                    / e_node )
-s_ns_flow_map_explicit_empty n c = s_separate n c & e_node & c_ns_flow_map_separate_value n c
+ns_flow_map_empty_key_entry  n c = e_node & c_ns_flow_map_separate_value n c
 
 c_ns_flow_map_separate_value n c = c_mapping_value ! "pair"
                                  & ( s_separate n c & ns_flow_node n c
@@ -429,28 +428,21 @@
                                  & ( ( s_separate n c ?) & ns_flow_node n c
                                    / e_node )
 
-ns_flow_map_implicit_entry  n c = c_ns_flow_map_implicit_json n c
-                                / ns_flow_map_implicit_yaml n c
-                                / ns_flow_map_implicit_empty n c
-c_ns_flow_map_implicit_json n c = c_s_simple_json_key  & ( c_ns_flow_map_adjacent_value n c / e_node )
-ns_flow_map_implicit_yaml   n c = ns_s_simple_yaml_key & ( c_ns_flow_map_separate_value n c / e_node )
-ns_flow_map_implicit_empty  n c = e_node & c_ns_flow_map_separate_value n c
-
-c_s_simple_json_key  = ( "node" ^ ( c_flow_json_node  na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
-ns_s_simple_yaml_key = ( "node" ^ ( ns_flow_yaml_node na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
+ns_flow_pair n c = nest BeginMapping
+                 & nest BeginPair
+                 & ( c_mapping_key ! "pair" & s_separate n c & ns_flow_map_explicit_entry n c
+                   / ns_flow_pair_entry n c )
+                 & nest EndPair
+                 & nest EndMapping
+ns_flow_pair_entry n c = "entry"
+                       ^ ( c_ns_flow_pair_json_key_entry n c
+                         / ns_flow_pair_yaml_key_entry n c
+                         / ns_flow_map_empty_key_entry n c )
+c_ns_flow_pair_json_key_entry n c = c_s_implicit_json_key  & c_ns_flow_map_adjacent_value n c
+ns_flow_pair_yaml_key_entry   n c = ns_s_implicit_yaml_key & c_ns_flow_map_separate_value n c
 
-ns_flow_map_single_pair   n c = nest BeginMapping
-                              & nest BeginPair
-                              & ( c_mapping_key ! "pair" & s_ns_flow_map_explicit_entry n c
-                                / ns_flow_map_single_entry n c )
-                              & nest EndPair
-                              & nest EndMapping
-ns_flow_map_single_entry  n c = "entry"
-                              ^ ( c_ns_flow_map_single_json n c
-                                / ns_flow_map_single_yaml n c
-                                / ns_flow_map_implicit_empty n c )
-c_ns_flow_map_single_json n c = c_s_simple_json_key  & c_ns_flow_map_adjacent_value n c
-ns_flow_map_single_yaml   n c = ns_s_simple_yaml_key & c_ns_flow_map_separate_value n c
+c_s_implicit_json_key  = ( "node" ^ ( c_flow_json_node  na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
+ns_s_implicit_yaml_key = ( "node" ^ ( ns_flow_yaml_node na FlowKey ) & ( s_separate_in_line ?) ) `limitedTo` 1024
 
 -- Alias:
 
@@ -634,7 +626,7 @@
 
 ns_l_block_map_implicit_entry n = ns_s_block_map_implicit_key & c_l_block_map_implicit_value n
                                 / e_node & c_l_block_map_implicit_value n
-ns_s_block_map_implicit_key     = c_s_simple_json_key / ns_s_simple_yaml_key
+ns_s_block_map_implicit_key     = c_s_implicit_json_key / ns_s_implicit_yaml_key
 c_l_block_map_implicit_value n  = c_mapping_value ! "node"
                                 & ( s_l__block_node n BlockIn
                                   / e_node & s_l_comments )
@@ -657,7 +649,7 @@
 
 s_l__block_scalar     n c = s_separate n c & ( c_ns_properties n c & s_separate n c ?)
                           & ( c_l__literal n / c_l__folded n )
-s_l__block_collection n c = ( s_l_comments / ( s_separate n c & c_ns_properties n c & s_l_comments ) )
+s_l__block_collection n c = ( ( s_separate n c & c_ns_properties n c ?) & s_l_comments ?)
                           & ( l__block_sequence (seq_spaces n c)  / l__block_mapping n )
 
 -- Document:
diff --git a/Text/Yaml/Reference.hs b/Text/Yaml/Reference.hs
--- a/Text/Yaml/Reference.hs
+++ b/Text/Yaml/Reference.hs
@@ -1184,8 +1184,8 @@
            $ PAT(c_sequence_end)
            $ PAT(c_sequence_entry)
            $ PAT(c_sequence_start)
+           $ PAT(c_s_implicit_json_key)
            $ PAT(c_single_quote)
-           $ PAT(c_s_simple_json_key)
            $ PAT(c_tag)
            $ PAT(c_tag_handle)
            $ PAT(c_verbatim_tag)
@@ -1240,8 +1240,8 @@
            $ PAT(ns_plain_safe_out)
            $ PAT(ns_reserved_directive)
            $ PAT(ns_s_block_map_implicit_key)
+           $ PAT(ns_s_implicit_yaml_key)
            $ PAT(ns_single_char)
-           $ PAT(ns_s_simple_yaml_key)
            $ PAT(ns_tag_char)
            $ PAT(ns_tag_directive)
            $ PAT(ns_tag_prefix)
@@ -1390,22 +1390,23 @@
                  $ PAT(c_flow_mapping)
                  $ PAT(c_flow_sequence)
                  $ PAT(c_ns_flow_map_adjacent_value)
-                 $ PAT(c_ns_flow_map_implicit_json)
+                 $ PAT(c_ns_flow_map_json_key_entry)
                  $ PAT(c_ns_flow_map_separate_value)
-                 $ PAT(c_ns_flow_map_single_json)
+                 $ PAT(c_ns_flow_pair_json_key_entry)
                  $ PAT(c_ns_properties)
                  $ PAT(c_single_quoted)
                  $ PAT(nb_double_text)
                  $ PAT(nb_single_text)
                  $ PAT(ns_flow_content)
+                 $ PAT(ns_flow_map_empty_key_entry)
                  $ PAT(ns_flow_map_entry)
-                 $ PAT(ns_flow_map_implicit_empty)
+                 $ PAT(ns_flow_map_explicit_entry)
                  $ PAT(ns_flow_map_implicit_entry)
-                 $ PAT(ns_flow_map_implicit_yaml)
-                 $ PAT(ns_flow_map_single_entry)
-                 $ PAT(ns_flow_map_single_pair)
-                 $ PAT(ns_flow_map_single_yaml)
+                 $ PAT(ns_flow_map_yaml_key_entry)
                  $ PAT(ns_flow_node)
+                 $ PAT(ns_flow_pair)
+                 $ PAT(ns_flow_pair_entry)
+                 $ PAT(ns_flow_pair_yaml_key_entry)
                  $ PAT(ns_flow_seq_entry)
                  $ PAT(ns_flow_yaml_content)
                  $ PAT(ns_flow_yaml_node)
@@ -1418,10 +1419,6 @@
                  $ PAT(s_l__block_indented)
                  $ PAT(s_l__block_node)
                  $ PAT(s_l__block_scalar)
-                 $ PAT(s_ns_flow_map_explicit_empty)
-                 $ PAT(s_ns_flow_map_explicit_entry)
-                 $ PAT(s_ns_flow_map_explicit_json)
-                 $ PAT(s_ns_flow_map_explicit_yaml)
                  $ PAT(s_ns_plain_next)
                  $ PAT(s_separate)
                  $ Map.empty
diff --git a/YamlReference.cabal b/YamlReference.cabal
--- a/YamlReference.cabal
+++ b/YamlReference.cabal
@@ -1,14 +1,14 @@
 Name:                YamlReference
-Version:             0.6
+Version:             0.7
 Cabal-Version:       >= 1.2
 License:             LGPL
 License-File:        lgpl.txt
-Copyright:           Oren Ben-Kiki 2007
+Copyright:           Oren Ben-Kiki 2007, 2008
 Author:              Oren Ben-Kiki
 Maintainer:          yaml-oren@ben-kiki.org
 Stability:           alpha
 Homepage:            www.ben-kiki.org/oren/YamlReference
-Package-Url:         www.ben-kiki.org/oren/YamlReference/YamlReference-0.6.tar.gz
+Package-Url:         www.ben-kiki.org/oren/YamlReference/YamlReference-0.7.tar.gz
 Category:            Text
 Synopsis:            YAML reference implementation
 Description:         This package contains \"the\" reference YAML syntax parser
@@ -21,10 +21,9 @@
                      possible to build interesting tools on top of it, such as
                      the @yeast2html@ YAML syntax visualizer (contained in this
                      package), pretty printers, etc. This is a streaming parser
-                     that will \"immediately\" begin to generate output. The
-                     memory leak that existed in previous version has been
-                     plugged. Package was updated for Cabal version 1.2 and a
-                     bug handling indentation in mapping keys was fixed.
+                     that will \"immediately\" begin to generate output. Updated
+                     to lift the 1K key size limit inside flow mapping for
+                     complete JSON compatibility.
 Extra-Source-Files:  Text/Yaml/Reference.bnf yeast2html yaml2yeast.css
                      tests/b-as-line-feed.input tests/b-as-line-feed.output
                      tests/b-carriage-return.input
@@ -42,8 +41,8 @@
                      tests/b-chomped-last.t=keep.output
                      tests/b-chomped-last.t=strip.input
                      tests/b-chomped-last.t=strip.output
-                     tests/b-generic.cr.input tests/b-generic.cr.output
-                     tests/b-generic.crlf.input tests/b-generic.crlf.output
+                     tests/b-generic.cr.input tests/b-generic.crlf.input
+                     tests/b-generic.crlf.output tests/b-generic.cr.output
                      tests/b-generic.invalid.input
                      tests/b-generic.invalid.output tests/b-generic.lf.input
                      tests/b-generic.lf.output tests/b-generic.nl.input
@@ -68,14 +67,16 @@
                      tests/b-l-folded-as-space.output
                      tests/b-l-folded-specific.n=4.s=plain.invalid.input
                      tests/b-l-folded-specific.n=4.s=plain.invalid.output
+                     tests/b-l-folded-specific.n=4.s=plain.ls.input
                      tests/b-l-folded-specific.n=4.s=plain.ls-lf-ls.input
                      tests/b-l-folded-specific.n=4.s=plain.ls-lf-ls.output
-                     tests/b-l-folded-specific.n=4.s=plain.ls.input
                      tests/b-l-folded-specific.n=4.s=plain.ls.output
                      tests/b-l-folded-trimmed.n=4.s=plain.invalid.input
                      tests/b-l-folded-trimmed.n=4.s=plain.invalid.output
                      tests/b-l-folded-trimmed.n=4.s=plain.lf-ls-lf.input
                      tests/b-l-folded-trimmed.n=4.s=plain.lf-ls-lf.output
+                     tests/b-line-feed.input tests/b-line-feed.output
+                     tests/b-line-separator.input tests/b-line-separator.output
                      tests/b-l-literal-next.n=4.input
                      tests/b-l-literal-next.n=4.invalid.input
                      tests/b-l-literal-next.n=4.invalid.output
@@ -83,9 +84,7 @@
                      tests/b-l-spaced.n=4.input
                      tests/b-l-spaced.n=4.invalid.input
                      tests/b-l-spaced.n=4.invalid.output
-                     tests/b-l-spaced.n=4.output tests/b-line-feed.input
-                     tests/b-line-feed.output tests/b-line-separator.input
-                     tests/b-line-separator.output tests/b-next-line.input
+                     tests/b-l-spaced.n=4.output tests/b-next-line.input
                      tests/b-next-line.output tests/b-normalized.invalid.input
                      tests/b-normalized.invalid.output
                      tests/b-normalized.lf.input tests/b-normalized.lf.output
@@ -99,17 +98,17 @@
                      tests/c-alias.output tests/c-anchor.input
                      tests/c-anchor.output
                      tests/c-b+block-header.n=2.s=folded.i.input
-                     tests/c-b+block-header.n=2.s=folded.i.output
                      tests/c-b+block-header.n=2.s=folded.im.input
                      tests/c-b+block-header.n=2.s=folded.im.output
                      tests/c-b+block-header.n=2.s=folded.imt.input
                      tests/c-b+block-header.n=2.s=folded.imt.output
                      tests/c-b+block-header.n=2.s=folded.invalid.input
                      tests/c-b+block-header.n=2.s=folded.invalid.output
+                     tests/c-b+block-header.n=2.s=folded.i.output
                      tests/c-b+block-header.n=2.s=folded.it.input
-                     tests/c-b+block-header.n=2.s=folded.it.output
                      tests/c-b+block-header.n=2.s=folded.itm.input
                      tests/c-b+block-header.n=2.s=folded.itm.output
+                     tests/c-b+block-header.n=2.s=folded.it.output
                      tests/c-byte-order-mark.invalid.input
                      tests/c-byte-order-mark.invalid.output
                      tests/c-byte-order-mark.utf16be.input
@@ -135,12 +134,12 @@
                      tests/c-document-end.output tests/c-document-start.input
                      tests/c-document-start.invalid.input
                      tests/c-document-start.invalid.output
-                     tests/c-document-start.output tests/c-double-quote.input
-                     tests/c-double-quote.output
+                     tests/c-document-start.output
                      tests/c-double-quoted.n=4.c=flow-out.input
                      tests/c-double-quoted.n=4.c=flow-out.invalid.input
                      tests/c-double-quoted.n=4.c=flow-out.invalid.output
                      tests/c-double-quoted.n=4.c=flow-out.output
+                     tests/c-double-quote.input tests/c-double-quote.output
                      tests/c-escape.input tests/c-escape.invalid.input
                      tests/c-escape.invalid.output tests/c-escape.output
                      tests/c-flow-indicator.collect-entry.input
@@ -173,6 +172,8 @@
                      tests/c-flow-mapping.n=4.c=flow-in.compact.output
                      tests/c-flow-mapping.n=4.c=flow-in.invalid.input
                      tests/c-flow-mapping.n=4.c=flow-in.invalid.output
+                     tests/c-flow-mapping.n=4.c=flow-in.long.input
+                     tests/c-flow-mapping.n=4.c=flow-in.long.output
                      tests/c-flow-mapping.n=4.c=flow-in.spaced.input
                      tests/c-flow-mapping.n=4.c=flow-in.spaced.output
                      tests/c-flow-sequence.n=4.c=flow-in.compact.input
@@ -225,20 +226,6 @@
                      tests/c-indicator.single-quote.input
                      tests/c-indicator.single-quote.output
                      tests/c-indicator.tag.input tests/c-indicator.tag.output
-                     tests/c-l+folded.n=2.indent.input
-                     tests/c-l+folded.n=2.indent.output
-                     tests/c-l+folded.n=2.invalid.input
-                     tests/c-l+folded.n=2.invalid.output
-                     tests/c-l+folded.n=2.simple.input
-                     tests/c-l+folded.n=2.simple.output
-                     tests/c-l+literal.n=2.invalid.input
-                     tests/c-l+literal.n=2.invalid.output
-                     tests/c-l+literal.n=2.simple.input
-                     tests/c-l+literal.n=2.simple.output
-                     tests/c-l+literal.n=2.strip-indent.input
-                     tests/c-l+literal.n=2.strip-indent.output
-                     tests/c-l+literal.n=2.strip.input
-                     tests/c-l+literal.n=2.strip.output
                      tests/c-l-block-map-explicit-entry.n=2.input
                      tests/c-l-block-map-explicit-entry.n=2.invalid.input
                      tests/c-l-block-map-explicit-entry.n=2.invalid.output
@@ -256,20 +243,33 @@
                      tests/c-l-block-seq-entry.n=2.input
                      tests/c-l-block-seq-entry.n=2.invalid.input
                      tests/c-l-block-seq-entry.n=2.invalid.output
-                     tests/c-l-block-seq-entry.n=2.output tests/c-literal.input
-                     tests/c-literal.output tests/c-mapping-end.input
-                     tests/c-mapping-end.output tests/c-mapping-key.input
-                     tests/c-mapping-key.output tests/c-mapping-start.input
-                     tests/c-mapping-start.output tests/c-mapping-value.input
-                     tests/c-mapping-value.output
+                     tests/c-l-block-seq-entry.n=2.output
+                     tests/c-l+folded.n=2.indent.input
+                     tests/c-l+folded.n=2.indent.output
+                     tests/c-l+folded.n=2.invalid.input
+                     tests/c-l+folded.n=2.invalid.output
+                     tests/c-l+folded.n=2.simple.input
+                     tests/c-l+folded.n=2.simple.output tests/c-literal.input
+                     tests/c-literal.output tests/c-l+literal.n=2.invalid.input
+                     tests/c-l+literal.n=2.invalid.output
+                     tests/c-l+literal.n=2.simple.input
+                     tests/c-l+literal.n=2.simple.output
+                     tests/c-l+literal.n=2.strip-indent.input
+                     tests/c-l+literal.n=2.strip-indent.output
+                     tests/c-l+literal.n=2.strip.input
+                     tests/c-l+literal.n=2.strip.output
+                     tests/c-mapping-end.input tests/c-mapping-end.output
+                     tests/c-mapping-key.input tests/c-mapping-key.output
+                     tests/c-mapping-start.input tests/c-mapping-start.output
+                     tests/c-mapping-value.input tests/c-mapping-value.output
                      tests/c-named-tag-handle.input
                      tests/c-named-tag-handle.invalid.input
                      tests/c-named-tag-handle.invalid.output
                      tests/c-named-tag-handle.output
-                     tests/c-nb-comment-text.comment-text.input
-                     tests/c-nb-comment-text.comment-text.output
                      tests/c-nb-comment-text.comment.input
                      tests/c-nb-comment-text.comment.output
+                     tests/c-nb-comment-text.comment-text.input
+                     tests/c-nb-comment-text.comment-text.output
                      tests/c-nb-comment-text.invalid.input
                      tests/c-nb-comment-text.invalid.output
                      tests/c-non-specific-tag.input
@@ -290,24 +290,24 @@
                      tests/c-ns-flow-map-adjacent-value.n=4.c=flow-in.invalid.output
                      tests/c-ns-flow-map-adjacent-value.n=4.c=flow-in.spaced.input
                      tests/c-ns-flow-map-adjacent-value.n=4.c=flow-in.spaced.output
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.input
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.output
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.input
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.output
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.input
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.output
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.input
-                     tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.output
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.input
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.output
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.input
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.output
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.input
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.output
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.input
+                     tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.output
                      tests/c-ns-flow-map-separate-value.n=4.c=flow-in.empty.input
                      tests/c-ns-flow-map-separate-value.n=4.c=flow-in.empty.output
                      tests/c-ns-flow-map-separate-value.n=4.c=flow-in.invalid.input
                      tests/c-ns-flow-map-separate-value.n=4.c=flow-in.invalid.output
                      tests/c-ns-flow-map-separate-value.n=4.c=flow-in.value.input
                      tests/c-ns-flow-map-separate-value.n=4.c=flow-in.value.output
-                     tests/c-ns-flow-map-single-json.n=4.c=flow-in.input
-                     tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.input
-                     tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.output
-                     tests/c-ns-flow-map-single-json.n=4.c=flow-in.output
+                     tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.input
+                     tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.input
+                     tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.output
+                     tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.output
                      tests/c-ns-local-tag-prefix.input
                      tests/c-ns-local-tag-prefix.invalid.input
                      tests/c-ns-local-tag-prefix.invalid.output
@@ -342,6 +342,24 @@
                      tests/c-ns-tag-property.shorthand.output
                      tests/c-ns-tag-property.verbatim.input
                      tests/c-ns-tag-property.verbatim.output
+                     tests/count-spaces.n=0.0.input
+                     tests/count-spaces.n=0.0.output
+                     tests/count-spaces.n=0.1.input
+                     tests/count-spaces.n=0.1.output
+                     tests/count-spaces.n=0.2.input
+                     tests/count-spaces.n=0.2.output
+                     tests/count-spaces.n=-1.0.input
+                     tests/count-spaces.n=1.0.input
+                     tests/count-spaces.n=-1.0.output
+                     tests/count-spaces.n=1.0.output
+                     tests/count-spaces.n=-1.1.input
+                     tests/count-spaces.n=1.1.input
+                     tests/count-spaces.n=-1.1.output
+                     tests/count-spaces.n=1.1.output
+                     tests/count-spaces.n=-1.2.input
+                     tests/count-spaces.n=1.2.input
+                     tests/count-spaces.n=-1.2.output
+                     tests/count-spaces.n=1.2.output
                      tests/c-primary-tag-handle.input
                      tests/c-primary-tag-handle.invalid.input
                      tests/c-primary-tag-handle.invalid.output
@@ -368,12 +386,6 @@
                      tests/c-quoted-quote.output tests/c-reserved.at.input
                      tests/c-reserved.at.output tests/c-reserved.backtick.input
                      tests/c-reserved.backtick.output
-                     tests/c-s-simple-json-key.just.input
-                     tests/c-s-simple-json-key.just.output
-                     tests/c-s-simple-json-key.long.input
-                     tests/c-s-simple-json-key.long.output
-                     tests/c-s-simple-json-key.short.input
-                     tests/c-s-simple-json-key.short.output
                      tests/c-secondary-tag-handle.input
                      tests/c-secondary-tag-handle.invalid.input
                      tests/c-secondary-tag-handle.invalid.output
@@ -381,11 +393,17 @@
                      tests/c-sequence-end.input tests/c-sequence-end.output
                      tests/c-sequence-entry.input tests/c-sequence-entry.output
                      tests/c-sequence-start.input tests/c-sequence-start.output
-                     tests/c-single-quote.input tests/c-single-quote.output
+                     tests/c-s-implicit-json-key.just.input
+                     tests/c-s-implicit-json-key.just.output
+                     tests/c-s-implicit-json-key.long.input
+                     tests/c-s-implicit-json-key.long.output
+                     tests/c-s-implicit-json-key.short.input
+                     tests/c-s-implicit-json-key.short.output
                      tests/c-single-quoted.n=4.c=flow-out.input
                      tests/c-single-quoted.n=4.c=flow-out.invalid.input
                      tests/c-single-quoted.n=4.c=flow-out.invalid.output
                      tests/c-single-quoted.n=4.c=flow-out.output
+                     tests/c-single-quote.input tests/c-single-quote.output
                      tests/c-style-indicator.s=folded.input
                      tests/c-style-indicator.s=folded.output
                      tests/c-style-indicator.s=literal.input
@@ -404,36 +422,22 @@
                      tests/c-verbatim-tag.invalid.input
                      tests/c-verbatim-tag.invalid.output
                      tests/c-verbatim-tag.output
-                     tests/count-spaces.n=-1.0.input
-                     tests/count-spaces.n=-1.0.output
-                     tests/count-spaces.n=-1.1.input
-                     tests/count-spaces.n=-1.1.output
-                     tests/count-spaces.n=-1.2.input
-                     tests/count-spaces.n=-1.2.output
-                     tests/count-spaces.n=0.0.input
-                     tests/count-spaces.n=0.0.output
-                     tests/count-spaces.n=0.1.input
-                     tests/count-spaces.n=0.1.output
-                     tests/count-spaces.n=0.2.input
-                     tests/count-spaces.n=0.2.output
-                     tests/count-spaces.n=1.0.input
-                     tests/count-spaces.n=1.0.output
-                     tests/count-spaces.n=1.1.input
-                     tests/count-spaces.n=1.1.output
-                     tests/count-spaces.n=1.2.input
-                     tests/count-spaces.n=1.2.output
                      tests/detect-collection-indentation.n=1.input
                      tests/detect-collection-indentation.n=1.output
                      tests/detect-inline-indentation.input
                      tests/detect-inline-indentation.output
                      tests/detect-scalar-indentation.n=2.input
                      tests/detect-scalar-indentation.n=2.output
-                     tests/e-no-document.input tests/e-no-document.output
                      tests/e-node.input tests/e-node.output
+                     tests/e-no-document.input tests/e-no-document.output
                      tests/e-scalar.input tests/e-scalar.output
+                     tests/l-block-map-explicit-value.n=2.input
+                     tests/l-block-map-explicit-value.n=2.invalid.input
+                     tests/l-block-map-explicit-value.n=2.invalid.output
+                     tests/l-block-map-explicit-value.n=2.output
                      tests/l+block-mapping.n=-1.input
-                     tests/l+block-mapping.n=-1.output
                      tests/l+block-mapping.n=1.input
+                     tests/l+block-mapping.n=-1.output
                      tests/l+block-mapping.n=1.output
                      tests/l+block-mapping.n=2.invalid.input
                      tests/l+block-mapping.n=2.invalid.output
@@ -441,10 +445,6 @@
                      tests/l+block-sequence.n=1.output
                      tests/l+block-sequence.n=2.invalid.input
                      tests/l+block-sequence.n=2.invalid.output
-                     tests/l-block-map-explicit-value.n=2.input
-                     tests/l-block-map-explicit-value.n=2.invalid.input
-                     tests/l-block-map-explicit-value.n=2.invalid.output
-                     tests/l-block-map-explicit-value.n=2.output
                      tests/l-chomped-empty.n=4.t=clip.input
                      tests/l-chomped-empty.n=4.t=clip.output
                      tests/l-chomped-empty.n=4.t=keep.input
@@ -477,26 +477,26 @@
                      tests/l-document-prefix.empty.output
                      tests/l-document-prefix.invalid.input
                      tests/l-document-prefix.invalid.output
-                     tests/l-document-suffix.input
-                     tests/l-document-suffix.invalid.input
-                     tests/l-document-suffix.invalid.output
-                     tests/l-document-suffix.output
                      tests/l-documents.explicit.input
                      tests/l-documents.explicit.output
                      tests/l-documents.implicit.input
                      tests/l-documents.implicit.output
+                     tests/l-document-suffix.input
+                     tests/l-document-suffix.invalid.input
+                     tests/l-document-suffix.invalid.output
+                     tests/l-document-suffix.output
+                     tests/l-empty.n=4.s=literal.indent.input
                      tests/l-empty.n=4.s=literal.indent-lt.input
                      tests/l-empty.n=4.s=literal.indent-lt.output
+                     tests/l-empty.n=4.s=literal.indent.output
                      tests/l-empty.n=4.s=literal.indent-sp.invalid.input
                      tests/l-empty.n=4.s=literal.indent-sp.invalid.output
-                     tests/l-empty.n=4.s=literal.indent.input
-                     tests/l-empty.n=4.s=literal.indent.output
+                     tests/l-empty.n=4.s=plain.indent.input
                      tests/l-empty.n=4.s=plain.indent-lt.input
                      tests/l-empty.n=4.s=plain.indent-lt.output
+                     tests/l-empty.n=4.s=plain.indent.output
                      tests/l-empty.n=4.s=plain.indent-sp.input
                      tests/l-empty.n=4.s=plain.indent-sp.output
-                     tests/l-empty.n=4.s=plain.indent.input
-                     tests/l-empty.n=4.s=plain.indent.output
                      tests/l-explicit-document.invalid.input
                      tests/l-explicit-document.invalid.output
                      tests/l-explicit-document.literal.input
@@ -517,9 +517,9 @@
                      tests/l-forbidden.end-space.output
                      tests/l-forbidden.invalid.input
                      tests/l-forbidden.invalid.output
+                     tests/l-forbidden.start.input
                      tests/l-forbidden.start-lf.input
                      tests/l-forbidden.start-lf.output
-                     tests/l-forbidden.start.input
                      tests/l-forbidden.start.output
                      tests/l-implicit-document.invalid.input
                      tests/l-implicit-document.invalid.output
@@ -624,12 +624,12 @@
                      tests/ns-anchor-char.output tests/ns-anchor-name.input
                      tests/ns-anchor-name.invalid.input
                      tests/ns-anchor-name.invalid.output
-                     tests/ns-anchor-name.output tests/ns-ascii-letter.Z.input
-                     tests/ns-ascii-letter.Z.output
-                     tests/ns-ascii-letter.a.input
+                     tests/ns-anchor-name.output tests/ns-ascii-letter.a.input
                      tests/ns-ascii-letter.a.output
                      tests/ns-ascii-letter.invalid.input
-                     tests/ns-ascii-letter.invalid.output tests/ns-char.input
+                     tests/ns-ascii-letter.invalid.output
+                     tests/ns-ascii-letter.Z.input
+                     tests/ns-ascii-letter.Z.output tests/ns-char.input
                      tests/ns-char.invalid.input tests/ns-char.invalid.output
                      tests/ns-char.output tests/ns-dec-digit.0.input
                      tests/ns-dec-digit.0.output tests/ns-dec-digit.1.input
@@ -692,10 +692,10 @@
                      tests/ns-esc-double-quote.output tests/ns-esc-escape.input
                      tests/ns-esc-escape.output tests/ns-esc-form-feed.input
                      tests/ns-esc-form-feed.output
-                     tests/ns-esc-horizontal-tab.t.input
-                     tests/ns-esc-horizontal-tab.t.output
                      tests/ns-esc-horizontal-tab.tab.input
                      tests/ns-esc-horizontal-tab.tab.output
+                     tests/ns-esc-horizontal-tab.t.input
+                     tests/ns-esc-horizontal-tab.t.output
                      tests/ns-esc-line-feed.input tests/ns-esc-line-feed.output
                      tests/ns-esc-line-separator.input
                      tests/ns-esc-line-separator.output
@@ -714,60 +714,63 @@
                      tests/ns-flow-content.n=4.c=flow-in.json.output
                      tests/ns-flow-content.n=4.c=flow-in.yaml.input
                      tests/ns-flow-content.n=4.c=flow-in.yaml.output
+                     tests/ns-flow-map-empty-key-entry-key-entry.n=4.c=flow-in.output
+                     tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.input
+                     tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.input
+                     tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.output
+                     tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.output
                      tests/ns-flow-map-entry.n=4.c=flow-in.explicit.input
                      tests/ns-flow-map-entry.n=4.c=flow-in.explicit.output
                      tests/ns-flow-map-entry.n=4.c=flow-in.implicit.input
                      tests/ns-flow-map-entry.n=4.c=flow-in.implicit.output
                      tests/ns-flow-map-entry.n=4.c=flow-in.invalid.input
                      tests/ns-flow-map-entry.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-implicit-empty.n=4.c=flow-in.input
-                     tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.input
-                     tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-implicit-empty.n=4.c=flow-in.output
-                     tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.input
-                     tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.output
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.input
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.output
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.input
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.output
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input
+                     tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output
                      tests/ns-flow-map-implicit-entry.n=4.c=flow-in.invalid.input
                      tests/ns-flow-map-implicit-entry.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.input
-                     tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.output
-                     tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.input
-                     tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.output
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.input
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.output
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.input
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.output
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.input
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.input
-                     tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.output
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.input
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.output
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.input
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.json.input
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.json.output
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.input
-                     tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.output
-                     tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.input
-                     tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.output
-                     tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.input
-                     tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.output
-                     tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.input
-                     tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-single-yaml.n=4.c=flow-in.input
-                     tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.input
-                     tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-map-single-yaml.n=4.c=flow-in.output
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.input
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.output
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.input
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.output
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.input
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.output
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.input
+                     tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.output
                      tests/ns-flow-node.n=4.c=flow-in.alias.input
                      tests/ns-flow-node.n=4.c=flow-in.alias.output
                      tests/ns-flow-node.n=4.c=flow-in.invalid.input
                      tests/ns-flow-node.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-node.n=4.c=flow-in.tag.input
-                     tests/ns-flow-node.n=4.c=flow-in.tag.output
                      tests/ns-flow-node.n=4.c=flow-in.tagged.input
                      tests/ns-flow-node.n=4.c=flow-in.tagged.output
+                     tests/ns-flow-node.n=4.c=flow-in.tag.input
+                     tests/ns-flow-node.n=4.c=flow-in.tag.output
                      tests/ns-flow-node.n=4.c=flow-in.untagged.input
                      tests/ns-flow-node.n=4.c=flow-in.untagged.output
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.empty.input
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.empty.output
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.input
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.output
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.json.input
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.json.output
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.input
+                     tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.output
+                     tests/ns-flow-pair.n=4.c=flow-in.explicit.input
+                     tests/ns-flow-pair.n=4.c=flow-in.explicit.output
+                     tests/ns-flow-pair.n=4.c=flow-in.implicit.input
+                     tests/ns-flow-pair.n=4.c=flow-in.implicit.output
+                     tests/ns-flow-pair.n=4.c=flow-in.invalid.input
+                     tests/ns-flow-pair.n=4.c=flow-in.invalid.output
+                     tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.input
+                     tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.input
+                     tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.output
+                     tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.output
                      tests/ns-flow-seq-entry.n=4.c=flow-in.invalid.input
                      tests/ns-flow-seq-entry.n=4.c=flow-in.invalid.output
                      tests/ns-flow-seq-entry.n=4.c=flow-in.node.input
@@ -782,10 +785,10 @@
                      tests/ns-flow-yaml-node.n=4.c=flow-in.alias.output
                      tests/ns-flow-yaml-node.n=4.c=flow-in.invalid.input
                      tests/ns-flow-yaml-node.n=4.c=flow-in.invalid.output
-                     tests/ns-flow-yaml-node.n=4.c=flow-in.tag.input
-                     tests/ns-flow-yaml-node.n=4.c=flow-in.tag.output
                      tests/ns-flow-yaml-node.n=4.c=flow-in.tagged.input
                      tests/ns-flow-yaml-node.n=4.c=flow-in.tagged.output
+                     tests/ns-flow-yaml-node.n=4.c=flow-in.tag.input
+                     tests/ns-flow-yaml-node.n=4.c=flow-in.tag.output
                      tests/ns-flow-yaml-node.n=4.c=flow-in.untagged.input
                      tests/ns-flow-yaml-node.n=4.c=flow-in.untagged.output
                      tests/ns-global-tag-prefix.input
@@ -793,12 +796,12 @@
                      tests/ns-global-tag-prefix.invalid.output
                      tests/ns-global-tag-prefix.output
                      tests/ns-hex-digit.6.input tests/ns-hex-digit.6.output
-                     tests/ns-hex-digit.B.input tests/ns-hex-digit.B.output
-                     tests/ns-hex-digit.D.input tests/ns-hex-digit.D.output
-                     tests/ns-hex-digit.F.input tests/ns-hex-digit.F.output
                      tests/ns-hex-digit.a.input tests/ns-hex-digit.a.output
+                     tests/ns-hex-digit.B.input tests/ns-hex-digit.B.output
                      tests/ns-hex-digit.c.input tests/ns-hex-digit.c.output
+                     tests/ns-hex-digit.D.input tests/ns-hex-digit.D.output
                      tests/ns-hex-digit.e.input tests/ns-hex-digit.e.output
+                     tests/ns-hex-digit.F.input tests/ns-hex-digit.F.output
                      tests/ns-hex-digit.invalid.input
                      tests/ns-hex-digit.invalid.output
                      tests/ns-l-block-map-entry.n=2.explicit.input
@@ -821,60 +824,60 @@
                      tests/ns-l-in-line-sequence.n=3.invalid.input
                      tests/ns-l-in-line-sequence.n=3.invalid.output
                      tests/ns-l-in-line-sequence.n=3.output
-                     tests/ns-plain-char.c=flow-in.a.input
-                     tests/ns-plain-char.c=flow-in.a.output
-                     tests/ns-plain-char.c=flow-in.ac.input
-                     tests/ns-plain-char.c=flow-in.ac.output
                      tests/ns-plain-char.c=flow-in.acc.input
                      tests/ns-plain-char.c=flow-in.acc.output
+                     tests/ns-plain-char.c=flow-in.ac.input
+                     tests/ns-plain-char.c=flow-in.ac.output
+                     tests/ns-plain-char.c=flow-in.a.input
+                     tests/ns-plain-char.c=flow-in.a.output
                      tests/ns-plain-char.c=flow-in.c.input
                      tests/ns-plain-char.c=flow-in.c.output
-                     tests/ns-plain-char.c=flow-in.m.input
-                     tests/ns-plain-char.c=flow-in.m.output
                      tests/ns-plain-char.c=flow-in.ma.input
                      tests/ns-plain-char.c=flow-in.ma.output
                      tests/ns-plain-char.c=flow-in.mc.input
                      tests/ns-plain-char.c=flow-in.mc.output
+                     tests/ns-plain-char.c=flow-in.m.input
                      tests/ns-plain-char.c=flow-in.mmcc.input
                      tests/ns-plain-char.c=flow-in.mmcc.output
                      tests/ns-plain-char.c=flow-in.mms.input
                      tests/ns-plain-char.c=flow-in.mms.output
+                     tests/ns-plain-char.c=flow-in.m.output
                      tests/ns-plain-char.c=flow-in.s.input
                      tests/ns-plain-char.c=flow-in.s.output
                      tests/ns-plain-first.c=flow-in.a.input
                      tests/ns-plain-first.c=flow-in.a.output
                      tests/ns-plain-first.c=flow-in.c.input
                      tests/ns-plain-first.c=flow-in.c.output
-                     tests/ns-plain-first.c=flow-in.d.input
-                     tests/ns-plain-first.c=flow-in.d.output
                      tests/ns-plain-first.c=flow-in.da.input
                      tests/ns-plain-first.c=flow-in.da.output
                      tests/ns-plain-first.c=flow-in.dc.input
                      tests/ns-plain-first.c=flow-in.dc.output
+                     tests/ns-plain-first.c=flow-in.d.input
+                     tests/ns-plain-first.c=flow-in.d.output
                      tests/ns-plain-first.c=flow-in.ds.input
                      tests/ns-plain-first.c=flow-in.ds.output
-                     tests/ns-plain-first.c=flow-in.i.input
-                     tests/ns-plain-first.c=flow-in.i.output
                      tests/ns-plain-first.c=flow-in.ia.input
                      tests/ns-plain-first.c=flow-in.ia.output
-                     tests/ns-plain-first.c=flow-in.k.input
-                     tests/ns-plain-first.c=flow-in.k.output
+                     tests/ns-plain-first.c=flow-in.i.input
+                     tests/ns-plain-first.c=flow-in.i.output
                      tests/ns-plain-first.c=flow-in.ka.input
                      tests/ns-plain-first.c=flow-in.ka.output
                      tests/ns-plain-first.c=flow-in.kc.input
                      tests/ns-plain-first.c=flow-in.kc.output
+                     tests/ns-plain-first.c=flow-in.k.input
+                     tests/ns-plain-first.c=flow-in.k.output
                      tests/ns-plain-first.c=flow-in.ks.input
                      tests/ns-plain-first.c=flow-in.ks.output
                      tests/ns-plain-first.c=flow-in.m.input
                      tests/ns-plain-first.c=flow-in.m.output
                      tests/ns-plain-first.c=flow-in.s.input
                      tests/ns-plain-first.c=flow-in.s.output
-                     tests/ns-plain-first.c=flow-in.v.input
-                     tests/ns-plain-first.c=flow-in.v.output
                      tests/ns-plain-first.c=flow-in.va.input
                      tests/ns-plain-first.c=flow-in.va.output
                      tests/ns-plain-first.c=flow-in.vc.input
                      tests/ns-plain-first.c=flow-in.vc.output
+                     tests/ns-plain-first.c=flow-in.v.input
+                     tests/ns-plain-first.c=flow-in.v.output
                      tests/ns-plain-first.c=flow-in.vs.input
                      tests/ns-plain-first.c=flow-in.vs.output
                      tests/ns-plain-first.c=flow-out.m.input
@@ -883,6 +886,22 @@
                      tests/ns-plain-multi.n=4.c=flow-in.invalid.input
                      tests/ns-plain-multi.n=4.c=flow-in.invalid.output
                      tests/ns-plain-multi.n=4.c=flow-in.output
+                     tests/ns-plain.n=4.c=flow-in.input
+                     tests/ns-plain.n=4.c=flow-in.output
+                     tests/ns-plain.n=4.c=flow-key.input
+                     tests/ns-plain.n=4.c=flow-key.invalid.input
+                     tests/ns-plain.n=4.c=flow-key.invalid.output
+                     tests/ns-plain.n=4.c=flow-key.output
+                     tests/ns-plain-safe.c=flow-in.mapping-start.input
+                     tests/ns-plain-safe.c=flow-in.mapping-start.output
+                     tests/ns-plain-safe.c=flow-in.v.input
+                     tests/ns-plain-safe.c=flow-in.v.output
+                     tests/ns-plain-safe.c=flow-out.a.input
+                     tests/ns-plain-safe.c=flow-out.a.output
+                     tests/ns-plain-safe.c=flow-out.c.input
+                     tests/ns-plain-safe.c=flow-out.c.output
+                     tests/ns-plain-safe.c=flow-out.mapping-start.input
+                     tests/ns-plain-safe.c=flow-out.mapping-start.output
                      tests/ns-plain-safe-in.a.input
                      tests/ns-plain-safe-in.a.output
                      tests/ns-plain-safe-in.c.input
@@ -899,26 +918,10 @@
                      tests/ns-plain-safe-out.mapping-start.output
                      tests/ns-plain-safe-out.v.input
                      tests/ns-plain-safe-out.v.output
-                     tests/ns-plain-safe.c=flow-in.mapping-start.input
-                     tests/ns-plain-safe.c=flow-in.mapping-start.output
-                     tests/ns-plain-safe.c=flow-in.v.input
-                     tests/ns-plain-safe.c=flow-in.v.output
-                     tests/ns-plain-safe.c=flow-out.a.input
-                     tests/ns-plain-safe.c=flow-out.a.output
-                     tests/ns-plain-safe.c=flow-out.c.input
-                     tests/ns-plain-safe.c=flow-out.c.output
-                     tests/ns-plain-safe.c=flow-out.mapping-start.input
-                     tests/ns-plain-safe.c=flow-out.mapping-start.output
                      tests/ns-plain-single.c=flow-key.invalid.input
                      tests/ns-plain-single.c=flow-key.invalid.output
                      tests/ns-plain-single.c=flow-out.input
                      tests/ns-plain-single.c=flow-out.output
-                     tests/ns-plain.n=4.c=flow-in.input
-                     tests/ns-plain.n=4.c=flow-in.output
-                     tests/ns-plain.n=4.c=flow-key.input
-                     tests/ns-plain.n=4.c=flow-key.invalid.input
-                     tests/ns-plain.n=4.c=flow-key.invalid.output
-                     tests/ns-plain.n=4.c=flow-key.output
                      tests/ns-reserved-directive.input
                      tests/ns-reserved-directive.invalid.input
                      tests/ns-reserved-directive.invalid.output
@@ -941,12 +944,12 @@
                      tests/ns-s-flow-seq-entries.n=4.c=flow-in.multi.output
                      tests/ns-s-flow-seq-entries.n=4.c=flow-in.single.input
                      tests/ns-s-flow-seq-entries.n=4.c=flow-in.single.output
-                     tests/ns-s-simple-yaml-key.just.input
-                     tests/ns-s-simple-yaml-key.just.output
-                     tests/ns-s-simple-yaml-key.long.input
-                     tests/ns-s-simple-yaml-key.long.output
-                     tests/ns-s-simple-yaml-key.short.input
-                     tests/ns-s-simple-yaml-key.short.output
+                     tests/ns-s-implicit-yaml-key.just.input
+                     tests/ns-s-implicit-yaml-key.just.output
+                     tests/ns-s-implicit-yaml-key.long.input
+                     tests/ns-s-implicit-yaml-key.long.output
+                     tests/ns-s-implicit-yaml-key.short.input
+                     tests/ns-s-implicit-yaml-key.short.output
                      tests/ns-single-char.input
                      tests/ns-single-char.invalid.input
                      tests/ns-single-char.invalid.output
@@ -1027,10 +1030,10 @@
                      tests/s-b-comment.invalid.output
                      tests/s-b-comment.sol-text.input
                      tests/s-b-comment.sol-text.output
-                     tests/s-b-comment.spaces-text.input
-                     tests/s-b-comment.spaces-text.output
                      tests/s-b-comment.spaces.input
                      tests/s-b-comment.spaces.output
+                     tests/s-b-comment.spaces-text.input
+                     tests/s-b-comment.spaces-text.output
                      tests/s-b-double-escaped.input
                      tests/s-b-double-escaped.invalid.input
                      tests/s-b-double-escaped.invalid.output
@@ -1059,23 +1062,23 @@
                      tests/s-ignored-prefix.n=4.s=plain.output
                      tests/s-ignored-prefix.n=4.s=single.input
                      tests/s-ignored-prefix.n=4.s=single.output
+                     tests/s-indent-le.n=0.input tests/s-indent-le.n=0.output
                      tests/s-indent-le.n=-1.invalid.input
                      tests/s-indent-le.n=-1.invalid.output
-                     tests/s-indent-le.n=0.input tests/s-indent-le.n=0.output
                      tests/s-indent-le.n=4.input
                      tests/s-indent-le.n=4.invalid.input
                      tests/s-indent-le.n=4.invalid.output
                      tests/s-indent-le.n=4.output
-                     tests/s-indent-lt.n=-1.invalid.input
-                     tests/s-indent-lt.n=-1.invalid.output
                      tests/s-indent-lt.n=0.invalid.input
                      tests/s-indent-lt.n=0.invalid.output
+                     tests/s-indent-lt.n=-1.invalid.input
+                     tests/s-indent-lt.n=-1.invalid.output
                      tests/s-indent-lt.n=4.input
                      tests/s-indent-lt.n=4.invalid.input
                      tests/s-indent-lt.n=4.invalid.output
-                     tests/s-indent-lt.n=4.output tests/s-indent.n=-1.input
-                     tests/s-indent.n=-1.output tests/s-indent.n=0.input
-                     tests/s-indent.n=0.output tests/s-indent.n=4.input
+                     tests/s-indent-lt.n=4.output tests/s-indent.n=0.input
+                     tests/s-indent.n=0.output tests/s-indent.n=-1.input
+                     tests/s-indent.n=-1.output tests/s-indent.n=4.input
                      tests/s-indent.n=4.invalid.input
                      tests/s-indent.n=4.invalid.output
                      tests/s-indent.n=4.output
@@ -1103,8 +1106,16 @@
                      tests/s-l+block-indented.n=2.c=block-out.literal.output
                      tests/s-l+block-indented.n=2.c=block-out.sequence.input
                      tests/s-l+block-indented.n=2.c=block-out.sequence.output
-                     tests/s-l+block-node.n=-1.c=block-out.input
-                     tests/s-l+block-node.n=-1.c=block-out.output
+                     tests/s-l+block-node.n=0.c=block-in.invalid.input
+                     tests/s-l+block-node.n=0.c=block-in.invalid.output
+                     tests/s-l+block-node.n=-1.c=block-in.input
+                     tests/s-l+block-node.n=-1.c=block-in.output
+                     tests/s-l+block-node.n=-1.c=block-out.1.input
+                     tests/s-l+block-node.n=-1.c=block-out.1.output
+                     tests/s-l+block-node.n=-1.c=block-out.2.input
+                     tests/s-l+block-node.n=-1.c=block-out.2.output
+                     tests/s-l+block-node.n=-1.c=block-out.3.input
+                     tests/s-l+block-node.n=-1.c=block-out.3.output
                      tests/s-l+block-node.n=2.c=block-out.block.input
                      tests/s-l+block-node.n=2.c=block-out.block.output
                      tests/s-l+block-node.n=2.c=block-out.flow.input
@@ -1115,10 +1126,6 @@
                      tests/s-l+block-scalar.n=2.c=block-out.folded.output
                      tests/s-l+block-scalar.n=2.c=block-out.literal.input
                      tests/s-l+block-scalar.n=2.c=block-out.literal.output
-                     tests/s-l+flow-in-block.n=2.input
-                     tests/s-l+flow-in-block.n=2.invalid.input
-                     tests/s-l+flow-in-block.n=2.invalid.output
-                     tests/s-l+flow-in-block.n=2.output
                      tests/s-l-comments.invalid.input
                      tests/s-l-comments.invalid.output
                      tests/s-l-comments.multi.input
@@ -1136,6 +1143,10 @@
                      tests/s-l-flow-folded.n=4.lf.output
                      tests/s-l-flow-folded.n=4.sp-lf-lf.input
                      tests/s-l-flow-folded.n=4.sp-lf-lf.output
+                     tests/s-l+flow-in-block.n=2.input
+                     tests/s-l+flow-in-block.n=2.invalid.input
+                     tests/s-l+flow-in-block.n=2.invalid.output
+                     tests/s-l+flow-in-block.n=2.output
                      tests/s-nb-folded-text.n=4.input
                      tests/s-nb-folded-text.n=4.invalid.input
                      tests/s-nb-folded-text.n=4.invalid.output
@@ -1152,26 +1163,6 @@
                      tests/s-ns-double-next.n=4.invalid.input
                      tests/s-ns-double-next.n=4.invalid.output
                      tests/s-ns-double-next.n=4.output
-                     tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.input
-                     tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.input
-                     tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.output
-                     tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.output
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.input
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.output
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.input
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.output
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input
-                     tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output
-                     tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.input
-                     tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.input
-                     tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.output
-                     tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.output
-                     tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.input
-                     tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.input
-                     tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.output
-                     tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.output
                      tests/s-ns-plain-chars.c=flow-in.input
                      tests/s-ns-plain-chars.c=flow-in.invalid.input
                      tests/s-ns-plain-chars.c=flow-in.invalid.output
diff --git a/tests/c-flow-mapping.n=4.c=flow-in.long.input b/tests/c-flow-mapping.n=4.c=flow-in.long.input
new file mode 100644
--- /dev/null
+++ b/tests/c-flow-mapping.n=4.c=flow-in.long.input
@@ -0,0 +1,1 @@
+{"123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdeX":"value"}
diff --git a/tests/c-flow-mapping.n=4.c=flow-in.long.output b/tests/c-flow-mapping.n=4.c=flow-in.long.output
new file mode 100644
--- /dev/null
+++ b/tests/c-flow-mapping.n=4.c=flow-in.long.output
@@ -0,0 +1,23 @@
+M
+I{
+!Commit to 'node' was made outside it
+X
+N
+S
+I"
+T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdeX
+I"
+s
+n
+I:
+N
+S
+I"
+!Commit to 'node' was made outside it
+Tvalue
+I"
+s
+n
+x
+I}
+m
diff --git a/tests/c-flow-mapping.n=4.c=flow-in.spaced.output b/tests/c-flow-mapping.n=4.c=flow-in.spaced.output
--- a/tests/c-flow-mapping.n=4.c=flow-in.spaced.output
+++ b/tests/c-flow-mapping.n=4.c=flow-in.spaced.output
@@ -60,12 +60,12 @@
 Te
 s
 n
-w 
 N
 S
 s
 n
 x
+w 
 I,
 w 
 I}
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.input b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.input
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a":b
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.output b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.output
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.compact.output
+++ /dev/null
@@ -1,15 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-I:
-!Commit to 'pair' was made outside it
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.input b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.input
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a"
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.output b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.output
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.empty.output
+++ /dev/null
@@ -1,11 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-N
-S
-s
-n
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.input b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.output b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,3 +0,0 @@
-N
-S
-!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.input b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.input
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a" : b
diff --git a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.output b/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.output
deleted file mode 100644
--- a/tests/c-ns-flow-map-implicit-json.n=4.c=flow-in.spaced.output
+++ /dev/null
@@ -1,17 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-w 
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.input b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.input
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.input
@@ -0,0 +1,1 @@
+"a":b
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.output b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.output
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.compact.output
@@ -0,0 +1,16 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+!Commit to 'pair' was made outside it
+I:
+!Commit to 'pair' was made outside it
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.input b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.input
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.input
@@ -0,0 +1,1 @@
+"a"
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.output b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.output
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.empty.output
@@ -0,0 +1,12 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+!Commit to 'pair' was made outside it
+N
+S
+s
+n
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.input b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.output b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.invalid.output
@@ -0,0 +1,3 @@
+N
+S
+!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.input b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.input
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.input
@@ -0,0 +1,1 @@
+"a" : b
diff --git a/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.output b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.output
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-map-json-key-entry.n=4.c=flow-in.spaced.output
@@ -0,0 +1,18 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+!Commit to 'pair' was made outside it
+w 
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.input b/tests/c-ns-flow-map-single-json.n=4.c=flow-in.input
deleted file mode 100644
--- a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a":b
diff --git a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.input b/tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.output b/tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,3 +0,0 @@
-N
-S
-!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.output b/tests/c-ns-flow-map-single-json.n=4.c=flow-in.output
deleted file mode 100644
--- a/tests/c-ns-flow-map-single-json.n=4.c=flow-in.output
+++ /dev/null
@@ -1,15 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-I:
-!Commit to 'pair' was made outside it
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.input b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.input
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.input
@@ -0,0 +1,1 @@
+"a":b
diff --git a/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.input b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.output b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.invalid.output
@@ -0,0 +1,3 @@
+N
+S
+!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.output b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.output
new file mode 100644
--- /dev/null
+++ b/tests/c-ns-flow-pair-json-key-entry.n=4.c=flow-in.output
@@ -0,0 +1,15 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+I:
+!Commit to 'pair' was made outside it
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/c-s-implicit-json-key.just.input b/tests/c-s-implicit-json-key.just.input
new file mode 100644
--- /dev/null
+++ b/tests/c-s-implicit-json-key.just.input
@@ -0,0 +1,1 @@
+"123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcde"
diff --git a/tests/c-s-implicit-json-key.just.output b/tests/c-s-implicit-json-key.just.output
new file mode 100644
--- /dev/null
+++ b/tests/c-s-implicit-json-key.just.output
@@ -0,0 +1,7 @@
+N
+S
+I"
+T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcde
+I"
+s
+n
diff --git a/tests/c-s-implicit-json-key.long.input b/tests/c-s-implicit-json-key.long.input
new file mode 100644
--- /dev/null
+++ b/tests/c-s-implicit-json-key.long.input
@@ -0,0 +1,1 @@
+"123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdeX"
diff --git a/tests/c-s-implicit-json-key.long.output b/tests/c-s-implicit-json-key.long.output
new file mode 100644
--- /dev/null
+++ b/tests/c-s-implicit-json-key.long.output
@@ -0,0 +1,5 @@
+N
+S
+I"
+T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdeX
+!$InputFile$: line 1: column 1024: Lookahead limit reached
diff --git a/tests/c-s-implicit-json-key.short.input b/tests/c-s-implicit-json-key.short.input
new file mode 100644
--- /dev/null
+++ b/tests/c-s-implicit-json-key.short.input
@@ -0,0 +1,1 @@
+"a" 
diff --git a/tests/c-s-implicit-json-key.short.output b/tests/c-s-implicit-json-key.short.output
new file mode 100644
--- /dev/null
+++ b/tests/c-s-implicit-json-key.short.output
@@ -0,0 +1,8 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+w 
diff --git a/tests/c-s-simple-json-key.just.input b/tests/c-s-simple-json-key.just.input
deleted file mode 100644
--- a/tests/c-s-simple-json-key.just.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcde"
diff --git a/tests/c-s-simple-json-key.just.output b/tests/c-s-simple-json-key.just.output
deleted file mode 100644
--- a/tests/c-s-simple-json-key.just.output
+++ /dev/null
@@ -1,7 +0,0 @@
-N
-S
-I"
-T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcde
-I"
-s
-n
diff --git a/tests/c-s-simple-json-key.long.input b/tests/c-s-simple-json-key.long.input
deleted file mode 100644
--- a/tests/c-s-simple-json-key.long.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdeX"
diff --git a/tests/c-s-simple-json-key.long.output b/tests/c-s-simple-json-key.long.output
deleted file mode 100644
--- a/tests/c-s-simple-json-key.long.output
+++ /dev/null
@@ -1,5 +0,0 @@
-N
-S
-I"
-T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdeX
-!$InputFile$: line 1: column 1024: Lookahead limit reached
diff --git a/tests/c-s-simple-json-key.short.input b/tests/c-s-simple-json-key.short.input
deleted file mode 100644
--- a/tests/c-s-simple-json-key.short.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a" 
diff --git a/tests/c-s-simple-json-key.short.output b/tests/c-s-simple-json-key.short.output
deleted file mode 100644
--- a/tests/c-s-simple-json-key.short.output
+++ /dev/null
@@ -1,8 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-w 
diff --git a/tests/ns-flow-map-empty-key-entry-key-entry.n=4.c=flow-in.output b/tests/ns-flow-map-empty-key-entry-key-entry.n=4.c=flow-in.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-empty-key-entry-key-entry.n=4.c=flow-in.output
@@ -0,0 +1,13 @@
+N
+S
+s
+n
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Ta
+s
+n
diff --git a/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.input b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.input
@@ -0,0 +1,1 @@
+: a
diff --git a/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+:"a"
diff --git a/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.invalid.output
@@ -0,0 +1,11 @@
+N
+S
+s
+n
+I:
+!Commit to 'pair' was made outside it
+N
+S
+s
+n
+!$InputFile$: line 1: column 1: Expected end of input
diff --git a/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.output b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-empty-key-entry.n=4.c=flow-in.output
@@ -0,0 +1,13 @@
+N
+S
+s
+n
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Ta
+s
+n
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output
@@ -0,0 +1,8 @@
+N
+S
+s
+n
+N
+S
+s
+n
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.input b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.input
@@ -0,0 +1,1 @@
+"a":b
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.output b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.json.output
@@ -0,0 +1,14 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+I:
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.input b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.input
@@ -0,0 +1,1 @@
+: a
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.output b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.value.output
@@ -0,0 +1,12 @@
+N
+S
+s
+n
+I:
+w 
+N
+S
+!Commit to 'node' was made outside it
+Ta
+s
+n
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output
@@ -0,0 +1,13 @@
+N
+S
+Ta
+s
+n
+I:
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.input b/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.input
+++ /dev/null
@@ -1,1 +0,0 @@
-: a
diff --git a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-:"a"
diff --git a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,11 +0,0 @@
-N
-S
-s
-n
-I:
-!Commit to 'pair' was made outside it
-N
-S
-s
-n
-!$InputFile$: line 1: column 1: Expected end of input
diff --git a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.output b/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-empty.n=4.c=flow-in.output
+++ /dev/null
@@ -1,13 +0,0 @@
-N
-S
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Ta
-s
-n
diff --git a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.input b/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.input
+++ /dev/null
@@ -1,1 +0,0 @@
-: a
diff --git a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.output b/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.empty.output
+++ /dev/null
@@ -1,13 +0,0 @@
-N
-S
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Ta
-s
-n
diff --git a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.input b/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a":b
diff --git a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.output b/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.json.output
+++ /dev/null
@@ -1,15 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-I:
-!Commit to 'pair' was made outside it
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.input b/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.output b/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-entry.n=4.c=flow-in.yaml.output
+++ /dev/null
@@ -1,14 +0,0 @@
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.input b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.output b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.compact.output
+++ /dev/null
@@ -1,14 +0,0 @@
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.input b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.output b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.empty.output
+++ /dev/null
@@ -1,9 +0,0 @@
-N
-S
-Ta
-s
-n
-N
-S
-s
-n
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a:b
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,9 +0,0 @@
-N
-S
-Ta:b
-s
-n
-N
-S
-s
-n
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.input b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.input
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a : b
diff --git a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.output b/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.output
deleted file mode 100644
--- a/tests/ns-flow-map-implicit-yaml.n=4.c=flow-in.spaced.output
+++ /dev/null
@@ -1,15 +0,0 @@
-N
-S
-Ta
-s
-n
-w 
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.input b/tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.input
+++ /dev/null
@@ -1,1 +0,0 @@
-: b
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.output b/tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.empty.output
+++ /dev/null
@@ -1,13 +0,0 @@
-N
-S
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,5 +0,0 @@
-N
-S
-s
-n
-!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.json.input b/tests/ns-flow-map-single-entry.n=4.c=flow-in.json.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.json.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a":b
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.json.output b/tests/ns-flow-map-single-entry.n=4.c=flow-in.json.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.json.output
+++ /dev/null
@@ -1,15 +0,0 @@
-N
-S
-I"
-Ta
-I"
-s
-n
-I:
-!Commit to 'pair' was made outside it
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.input b/tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.output b/tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-entry.n=4.c=flow-in.yaml.output
+++ /dev/null
@@ -1,14 +0,0 @@
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.input b/tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.input
+++ /dev/null
@@ -1,1 +0,0 @@
-? a: b
diff --git a/tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.output b/tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-pair.n=4.c=flow-in.explicit.output
+++ /dev/null
@@ -1,21 +0,0 @@
-M
-X
-I?
-!Commit to 'pair' was made outside it
-w 
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
-x
-m
diff --git a/tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.input b/tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.output b/tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-pair.n=4.c=flow-in.implicit.output
+++ /dev/null
@@ -1,18 +0,0 @@
-M
-X
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
-x
-m
diff --git a/tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a
diff --git a/tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-pair.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,7 +0,0 @@
-M
-X
-N
-S
-s
-n
-!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.input b/tests/ns-flow-map-single-yaml.n=4.c=flow-in.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a:b
diff --git a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,6 +0,0 @@
-N
-S
-Ta:b
-s
-n
-!$InputFile$: line 1: column 3: Unexpected end of input
diff --git a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.output b/tests/ns-flow-map-single-yaml.n=4.c=flow-in.output
deleted file mode 100644
--- a/tests/ns-flow-map-single-yaml.n=4.c=flow-in.output
+++ /dev/null
@@ -1,14 +0,0 @@
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.input b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.output b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.compact.output
@@ -0,0 +1,15 @@
+N
+S
+Ta
+s
+n
+!Commit to 'pair' was made outside it
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.input b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.input
@@ -0,0 +1,1 @@
+a
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.output b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.empty.output
@@ -0,0 +1,10 @@
+N
+S
+Ta
+s
+n
+!Commit to 'pair' was made outside it
+N
+S
+s
+n
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.input b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+a:b
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.output b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.invalid.output
@@ -0,0 +1,10 @@
+N
+S
+Ta:b
+s
+n
+!Commit to 'pair' was made outside it
+N
+S
+s
+n
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.input b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.input
@@ -0,0 +1,1 @@
+a : b
diff --git a/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.output b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-map-yaml-key-entry.n=4.c=flow-in.spaced.output
@@ -0,0 +1,16 @@
+N
+S
+Ta
+s
+n
+!Commit to 'pair' was made outside it
+w 
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.empty.input b/tests/ns-flow-pair-entry.n=4.c=flow-in.empty.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.empty.input
@@ -0,0 +1,1 @@
+: b
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.empty.output b/tests/ns-flow-pair-entry.n=4.c=flow-in.empty.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.empty.output
@@ -0,0 +1,13 @@
+N
+S
+s
+n
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.input b/tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+a
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.output b/tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.invalid.output
@@ -0,0 +1,5 @@
+N
+S
+s
+n
+!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.json.input b/tests/ns-flow-pair-entry.n=4.c=flow-in.json.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.json.input
@@ -0,0 +1,1 @@
+"a":b
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.json.output b/tests/ns-flow-pair-entry.n=4.c=flow-in.json.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.json.output
@@ -0,0 +1,15 @@
+N
+S
+I"
+Ta
+I"
+s
+n
+I:
+!Commit to 'pair' was made outside it
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.input b/tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.output b/tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-entry.n=4.c=flow-in.yaml.output
@@ -0,0 +1,14 @@
+N
+S
+Ta
+s
+n
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.input b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.input b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+a:b
diff --git a/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.output b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.invalid.output
@@ -0,0 +1,6 @@
+N
+S
+Ta:b
+s
+n
+!$InputFile$: line 1: column 3: Unexpected end of input
diff --git a/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.output b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair-yaml-key-entry.n=4.c=flow-in.output
@@ -0,0 +1,14 @@
+N
+S
+Ta
+s
+n
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
diff --git a/tests/ns-flow-pair.n=4.c=flow-in.explicit.input b/tests/ns-flow-pair.n=4.c=flow-in.explicit.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair.n=4.c=flow-in.explicit.input
@@ -0,0 +1,1 @@
+? a: b
diff --git a/tests/ns-flow-pair.n=4.c=flow-in.explicit.output b/tests/ns-flow-pair.n=4.c=flow-in.explicit.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair.n=4.c=flow-in.explicit.output
@@ -0,0 +1,20 @@
+M
+X
+I?
+!Commit to 'pair' was made outside it
+w 
+N
+S
+Ta
+s
+n
+I:
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
+x
+m
diff --git a/tests/ns-flow-pair.n=4.c=flow-in.implicit.input b/tests/ns-flow-pair.n=4.c=flow-in.implicit.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair.n=4.c=flow-in.implicit.input
@@ -0,0 +1,1 @@
+a: b
diff --git a/tests/ns-flow-pair.n=4.c=flow-in.implicit.output b/tests/ns-flow-pair.n=4.c=flow-in.implicit.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair.n=4.c=flow-in.implicit.output
@@ -0,0 +1,18 @@
+M
+X
+N
+S
+Ta
+s
+n
+I:
+!Commit to 'pair' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tb
+s
+n
+x
+m
diff --git a/tests/ns-flow-pair.n=4.c=flow-in.invalid.input b/tests/ns-flow-pair.n=4.c=flow-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair.n=4.c=flow-in.invalid.input
@@ -0,0 +1,1 @@
+a
diff --git a/tests/ns-flow-pair.n=4.c=flow-in.invalid.output b/tests/ns-flow-pair.n=4.c=flow-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-flow-pair.n=4.c=flow-in.invalid.output
@@ -0,0 +1,7 @@
+M
+X
+N
+S
+s
+n
+!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/ns-s-implicit-yaml-key.just.input b/tests/ns-s-implicit-yaml-key.just.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-s-implicit-yaml-key.just.input
@@ -0,0 +1,1 @@
+123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 
diff --git a/tests/ns-s-implicit-yaml-key.just.output b/tests/ns-s-implicit-yaml-key.just.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-s-implicit-yaml-key.just.output
@@ -0,0 +1,6 @@
+N
+S
+T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef
+s
+n
+w 
diff --git a/tests/ns-s-implicit-yaml-key.long.input b/tests/ns-s-implicit-yaml-key.long.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-s-implicit-yaml-key.long.input
@@ -0,0 +1,1 @@
+123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef X
diff --git a/tests/ns-s-implicit-yaml-key.long.output b/tests/ns-s-implicit-yaml-key.long.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-s-implicit-yaml-key.long.output
@@ -0,0 +1,7 @@
+N
+S
+T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef
+s
+n
+w 
+!$InputFile$: line 1: column 1024: Expected end of input
diff --git a/tests/ns-s-implicit-yaml-key.short.input b/tests/ns-s-implicit-yaml-key.short.input
new file mode 100644
--- /dev/null
+++ b/tests/ns-s-implicit-yaml-key.short.input
@@ -0,0 +1,1 @@
+a 
diff --git a/tests/ns-s-implicit-yaml-key.short.output b/tests/ns-s-implicit-yaml-key.short.output
new file mode 100644
--- /dev/null
+++ b/tests/ns-s-implicit-yaml-key.short.output
@@ -0,0 +1,6 @@
+N
+S
+Ta
+s
+n
+w 
diff --git a/tests/ns-s-simple-yaml-key.just.input b/tests/ns-s-simple-yaml-key.just.input
deleted file mode 100644
--- a/tests/ns-s-simple-yaml-key.just.input
+++ /dev/null
@@ -1,1 +0,0 @@
-123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 
diff --git a/tests/ns-s-simple-yaml-key.just.output b/tests/ns-s-simple-yaml-key.just.output
deleted file mode 100644
--- a/tests/ns-s-simple-yaml-key.just.output
+++ /dev/null
@@ -1,6 +0,0 @@
-N
-S
-T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef
-s
-n
-w 
diff --git a/tests/ns-s-simple-yaml-key.long.input b/tests/ns-s-simple-yaml-key.long.input
deleted file mode 100644
--- a/tests/ns-s-simple-yaml-key.long.input
+++ /dev/null
@@ -1,1 +0,0 @@
-123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef X
diff --git a/tests/ns-s-simple-yaml-key.long.output b/tests/ns-s-simple-yaml-key.long.output
deleted file mode 100644
--- a/tests/ns-s-simple-yaml-key.long.output
+++ /dev/null
@@ -1,7 +0,0 @@
-N
-S
-T123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef 123456789abcdef
-s
-n
-w 
-!$InputFile$: line 1: column 1024: Expected end of input
diff --git a/tests/ns-s-simple-yaml-key.short.input b/tests/ns-s-simple-yaml-key.short.input
deleted file mode 100644
--- a/tests/ns-s-simple-yaml-key.short.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a 
diff --git a/tests/ns-s-simple-yaml-key.short.output b/tests/ns-s-simple-yaml-key.short.output
deleted file mode 100644
--- a/tests/ns-s-simple-yaml-key.short.output
+++ /dev/null
@@ -1,6 +0,0 @@
-N
-S
-Ta
-s
-n
-w 
diff --git a/tests/s-l+block-node.n=-1.c=block-in.input b/tests/s-l+block-node.n=-1.c=block-in.input
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-in.input
@@ -0,0 +1,1 @@
+a
diff --git a/tests/s-l+block-node.n=-1.c=block-in.output b/tests/s-l+block-node.n=-1.c=block-in.output
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-in.output
@@ -0,0 +1,7 @@
+N
+S
+!Commit to 'node' was made outside it
+Ta
+s
+n
+b\x0a
diff --git a/tests/s-l+block-node.n=-1.c=block-out.1.input b/tests/s-l+block-node.n=-1.c=block-out.1.input
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-out.1.input
@@ -0,0 +1,1 @@
+!a b: c
diff --git a/tests/s-l+block-node.n=-1.c=block-out.1.output b/tests/s-l+block-node.n=-1.c=block-out.1.output
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-out.1.output
@@ -0,0 +1,30 @@
+N
+M
+X
+N
+P
+G
+H
+I!
+h
+ta
+g
+p
+w 
+S
+Tb
+s
+n
+I:
+!Commit to 'node' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tc
+s
+n
+b\x0a
+x
+m
+n
diff --git a/tests/s-l+block-node.n=-1.c=block-out.2.input b/tests/s-l+block-node.n=-1.c=block-out.2.input
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-out.2.input
@@ -0,0 +1,2 @@
+!a
+b: c
diff --git a/tests/s-l+block-node.n=-1.c=block-out.2.output b/tests/s-l+block-node.n=-1.c=block-out.2.output
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-out.2.output
@@ -0,0 +1,30 @@
+N
+P
+G
+H
+I!
+h
+ta
+g
+p
+b\x0a
+M
+X
+N
+S
+Tb
+s
+n
+I:
+!Commit to 'node' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Tc
+s
+n
+b\x0a
+x
+m
+n
diff --git a/tests/s-l+block-node.n=-1.c=block-out.3.input b/tests/s-l+block-node.n=-1.c=block-out.3.input
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-out.3.input
@@ -0,0 +1,2 @@
+!a
+!b c: d
diff --git a/tests/s-l+block-node.n=-1.c=block-out.3.output b/tests/s-l+block-node.n=-1.c=block-out.3.output
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=-1.c=block-out.3.output
@@ -0,0 +1,39 @@
+N
+P
+G
+H
+I!
+h
+ta
+g
+p
+b\x0a
+M
+X
+N
+P
+G
+H
+I!
+h
+tb
+g
+p
+w 
+S
+Tc
+s
+n
+I:
+!Commit to 'node' was made outside it
+w 
+N
+S
+!Commit to 'node' was made outside it
+Td
+s
+n
+b\x0a
+x
+m
+n
diff --git a/tests/s-l+block-node.n=-1.c=block-out.input b/tests/s-l+block-node.n=-1.c=block-out.input
deleted file mode 100644
--- a/tests/s-l+block-node.n=-1.c=block-out.input
+++ /dev/null
@@ -1,1 +0,0 @@
-!a b: c
diff --git a/tests/s-l+block-node.n=-1.c=block-out.output b/tests/s-l+block-node.n=-1.c=block-out.output
deleted file mode 100644
--- a/tests/s-l+block-node.n=-1.c=block-out.output
+++ /dev/null
@@ -1,30 +0,0 @@
-N
-M
-X
-N
-P
-G
-H
-I!
-h
-ta
-g
-p
-w 
-S
-Tb
-s
-n
-I:
-!Commit to 'node' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tc
-s
-n
-b\x0a
-x
-m
-n
diff --git a/tests/s-l+block-node.n=0.c=block-in.invalid.input b/tests/s-l+block-node.n=0.c=block-in.invalid.input
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=0.c=block-in.invalid.input
@@ -0,0 +1,2 @@
+
+a
diff --git a/tests/s-l+block-node.n=0.c=block-in.invalid.output b/tests/s-l+block-node.n=0.c=block-in.invalid.output
new file mode 100644
--- /dev/null
+++ b/tests/s-l+block-node.n=0.c=block-in.invalid.output
@@ -0,0 +1,3 @@
+N
+S
+!$InputFile$: line 1: column 0: Unexpected '\x0a'
diff --git a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.input b/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.input
+++ /dev/null
@@ -1,1 +0,0 @@
- : a
diff --git a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.input b/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.output b/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,5 +0,0 @@
-N
-S
-s
-n
-!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.output b/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-empty.n=4.c=flow-in.output
+++ /dev/null
@@ -1,14 +0,0 @@
-w 
-N
-S
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Ta
-s
-n
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.input
+++ /dev/null
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.empty.output
+++ /dev/null
@@ -1,8 +0,0 @@
-N
-S
-s
-n
-N
-S
-s
-n
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.input b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.input
+++ /dev/null
@@ -1,1 +0,0 @@
- "a":b
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.output b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.json.output
+++ /dev/null
@@ -1,16 +0,0 @@
-w 
-N
-S
-I"
-Ta
-I"
-s
-n
-I:
-!Commit to 'pair' was made outside it
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.input b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.input
+++ /dev/null
@@ -1,1 +0,0 @@
- : a
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.output b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.value.output
+++ /dev/null
@@ -1,14 +0,0 @@
-w 
-N
-S
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Ta
-s
-n
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.input
+++ /dev/null
@@ -1,1 +0,0 @@
- a: b
diff --git a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output b/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-entry.n=4.c=flow-in.yaml.output
+++ /dev/null
@@ -1,15 +0,0 @@
-w 
-N
-S
-Ta
-s
-n
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.input b/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.input
+++ /dev/null
@@ -1,1 +0,0 @@
- "a":b
diff --git a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.input b/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-a: b
diff --git a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.output b/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,3 +0,0 @@
-N
-S
-!$InputFile$: line 1: column 0: Unexpected 'a'
diff --git a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.output b/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-json.n=4.c=flow-in.output
+++ /dev/null
@@ -1,17 +0,0 @@
-w 
-N
-S
-I"
-Ta
-I"
-s
-n
-!Commit to 'entry' was made outside it
-I:
-!Commit to 'pair' was made outside it
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
diff --git a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.input b/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.input
+++ /dev/null
@@ -1,1 +0,0 @@
- a: b
diff --git a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.input b/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.input
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.input
+++ /dev/null
@@ -1,1 +0,0 @@
-"a": b
diff --git a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.output b/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.invalid.output
+++ /dev/null
@@ -1,3 +0,0 @@
-N
-S
-!$InputFile$: line 1: column 0: Unexpected '"'
diff --git a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.output b/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.output
deleted file mode 100644
--- a/tests/s-ns-flow-map-explicit-yaml.n=4.c=flow-in.output
+++ /dev/null
@@ -1,16 +0,0 @@
-w 
-N
-S
-Ta
-s
-n
-!Commit to 'entry' was made outside it
-I:
-!Commit to 'pair' was made outside it
-w 
-N
-S
-!Commit to 'node' was made outside it
-Tb
-s
-n
