diff --git a/examples/duplicate-paths.yml b/examples/duplicate-paths.yml
index 6d1092c..ab61b10 100644
--- a/examples/duplicate-paths.yml
+++ b/examples/duplicate-paths.yml
@@ -54,62 +54,63 @@ ca:
           log point: Calculate hashes for identifiers with shared hashes (4.5.3 (5)).
           with:
             - identifier: e0
-              log point: Hash N-Degree Quads function (4.9.3).
-              issuer: {e0: b0}
-              hndq.2:
-                log point: Quads for identifier (4.9.3 (2)).
-                quads:
+              hndq:
+                log point: Hash N-Degree Quads function (4.9.3).
+                identifier: e0
+                issuer: {e0: b0}
+                hndq.2:
+                  log point: Quads for identifier (4.9.3 (2)).
+                  quads:
                   - _:e0 <http://example.com/#p1> _:e1 .
-              hndq.3:
-                log point: Hash N-Degree Quads function (4.9.3 (3)).
-                with:
-                  - quad: _:e0 <http://example.com/#p1> _:e1 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: o
-                          related: e1
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:z <http://example.com/#p1> _:a .
-                              - _:a <http://example.com/#p2> "Foo" .
-                            hash: a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a
-                          input: "o<http://example.com/#p1>a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a"
-                          hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
-                Hash to bnodes:
-                  3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c:
-                    - e1:
-              hndq.5:
-                log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
-                with:
-                  - related hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
-                    data to hash: ""
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e1"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e1
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: [ "e1"]
-                          path: "_:b1"
-                          with:
-                            hndq.5.4.5.1:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.1)), before possible recursion.
-                              with:
-                                - related: e1
+                hndq.3:
+                  log point: Hash N-Degree Quads function (4.9.3 (3)).
+                  with:
+                    - quad: _:e0 <http://example.com/#p1> _:e1 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: o
+                            related: e1
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:z <http://example.com/#p1> _:a .
+                                - _:a <http://example.com/#p2> "Foo" .
+                              hash: a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a
+                            input: "o<http://example.com/#p1>a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a"
+                            hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
+                  Hash to bnodes:
+                      3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c:
+                        - e1:
+                hndq.5:
+                  log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
+                  with:
+                    - related hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
+                      data to hash: ""
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e1"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e1
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: [ "e1"]
+                            path: "_:b1"
+                            with:
+                              - related: e1
+                                hndq:
                                   log point: Hash N-Degree Quads function (4.9.3).
+                                  identifier: e1
                                   issuer: {e0: b0, e1: b1}
                                   hndq.2:
                                     log point: Quads for identifier (4.9.3 (2)).
                                     quads:
-                                      - _:e0 <http://example.com/#p1> _:e1 .
-                                      - _:e1 <http://example.com/#p2> "Foo" .
+                                    - _:e0 <http://example.com/#p1> _:e1 .
+                                    - _:e1 <http://example.com/#p2> "Foo" .
                                   hndq.3:
                                     log point: Hash N-Degree Quads function (4.9.3 (3)).
                                     with:
@@ -126,8 +127,8 @@ ca:
                                           log point: Hash related bnode component (4.9.3 (3.1))
                                           with:
                                     Hash to bnodes:
-                                      924a034861aa3fbdaf67a939abc4a2f4e233351bccb26718cb8c151b1746f677:
-                                        - e0:
+                                        924a034861aa3fbdaf67a939abc4a2f4e233351bccb26718cb8c151b1746f677:
+                                          - e0:
                                   hndq.5:
                                     log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
                                     with:
@@ -154,76 +155,77 @@ ca:
                                     log point: Leaving Hash N-Degree Quads function (4.9.3).
                                     hash: c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c
                                     issuer: {e0: b0, e1: b1}
-                            hndq.5.4.5.4:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
-                              path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
-                              issuer copy: {e0: b0, e1: b1}
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
-                      data to hash: "3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
-              hndq.6:
-                log point: Leaving Hash N-Degree Quads function (4.9.3).
-                hash: 39d609fcd8236b74c70744f492cd2baaf0a55765b380ff9e0811ce23e2f409d7
-                issuer: {e0: b0, e1: b1}
+                                hndq.5.4.5.4:
+                                  log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
+                                  path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
+                                  issuer copy: {e0: b0, e1: b1}
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
+                        data to hash: "3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
+                hndq.6:
+                  log point: Leaving Hash N-Degree Quads function (4.9.3).
+                  hash: 39d609fcd8236b74c70744f492cd2baaf0a55765b380ff9e0811ce23e2f409d7
+                  issuer: {e0: b0, e1: b1}
           with:
             - identifier: e2
-              log point: Hash N-Degree Quads function (4.9.3).
-              issuer: {e2: b0}
-              hndq.2:
-                log point: Quads for identifier (4.9.3 (2)).
-                quads:
+              hndq:
+                log point: Hash N-Degree Quads function (4.9.3).
+                identifier: e2
+                issuer: {e2: b0}
+                hndq.2:
+                  log point: Quads for identifier (4.9.3 (2)).
+                  quads:
                   - _:e2 <http://example.com/#p1> _:e3 .
-              hndq.3:
-                log point: Hash N-Degree Quads function (4.9.3 (3)).
-                with:
-                  - quad: _:e2 <http://example.com/#p1> _:e3 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: o
-                          related: e3
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:z <http://example.com/#p1> _:a .
-                              - _:a <http://example.com/#p2> "Foo" .
-                            hash: a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a
-                          input: "o<http://example.com/#p1>a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a"
-                          hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
-                Hash to bnodes:
-                  3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c:
-                    - e3:
-              hndq.5:
-                log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
-                with:
-                  - related hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
-                    data to hash: ""
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e3"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e3
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: [ "e3"]
-                          path: "_:b1"
-                          with:
-                            hndq.5.4.5.1:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.1)), before possible recursion.
-                              with:
-                                - related: e3
+                hndq.3:
+                  log point: Hash N-Degree Quads function (4.9.3 (3)).
+                  with:
+                    - quad: _:e2 <http://example.com/#p1> _:e3 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: o
+                            related: e3
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:z <http://example.com/#p1> _:a .
+                                - _:a <http://example.com/#p2> "Foo" .
+                              hash: a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a
+                            input: "o<http://example.com/#p1>a994e40b576809985bc0f389308cd9d552fd7c89d028c163848a6b2d33a8583a"
+                            hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
+                  Hash to bnodes:
+                      3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c:
+                        - e3:
+                hndq.5:
+                  log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
+                  with:
+                    - related hash: 3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c
+                      data to hash: ""
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e3"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e3
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: [ "e3"]
+                            path: "_:b1"
+                            with:
+                              - related: e3
+                                hndq:
                                   log point: Hash N-Degree Quads function (4.9.3).
+                                  identifier: e3
                                   issuer: {e2: b0, e3: b1}
                                   hndq.2:
                                     log point: Quads for identifier (4.9.3 (2)).
                                     quads:
-                                      - _:e2 <http://example.com/#p1> _:e3 .
-                                      - _:e3 <http://example.com/#p2> "Foo" .
+                                    - _:e2 <http://example.com/#p1> _:e3 .
+                                    - _:e3 <http://example.com/#p2> "Foo" .
                                   hndq.3:
                                     log point: Hash N-Degree Quads function (4.9.3 (3)).
                                     with:
@@ -240,8 +242,8 @@ ca:
                                           log point: Hash related bnode component (4.9.3 (3.1))
                                           with:
                                     Hash to bnodes:
-                                      924a034861aa3fbdaf67a939abc4a2f4e233351bccb26718cb8c151b1746f677:
-                                        - e2:
+                                        924a034861aa3fbdaf67a939abc4a2f4e233351bccb26718cb8c151b1746f677:
+                                          - e2:
                                   hndq.5:
                                     log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
                                     with:
@@ -268,18 +270,18 @@ ca:
                                     log point: Leaving Hash N-Degree Quads function (4.9.3).
                                     hash: c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c
                                     issuer: {e2: b0, e3: b1}
-                            hndq.5.4.5.4:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
-                              path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
-                              issuer copy: {e2: b0, e3: b1}
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
-                      data to hash: "3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
-              hndq.6:
-                log point: Leaving Hash N-Degree Quads function (4.9.3).
-                hash: 39d609fcd8236b74c70744f492cd2baaf0a55765b380ff9e0811ce23e2f409d7
-                issuer: {e2: b0, e3: b1}
+                                hndq.5.4.5.4:
+                                  log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
+                                  path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
+                                  issuer copy: {e2: b0, e3: b1}
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
+                        data to hash: "3d96946f27fc34a78e8d067135a1cb1b77083aebc4b2c6cbdc536f067242686c_:b1_:b1<c484f98e6cbf9e21f287433c8b1caa7f1486fd61d84ab220a494bf8184751b8c>"
+                hndq.6:
+                  log point: Leaving Hash N-Degree Quads function (4.9.3).
+                  hash: 39d609fcd8236b74c70744f492cd2baaf0a55765b380ff9e0811ce23e2f409d7
+                  issuer: {e2: b0, e3: b1}
     ca5.3:
     - result: 39d609fcd8236b74c70744f492cd2baaf0a55765b380ff9e0811ce23e2f409d7
       issuer: {e0: b0, e1: b1}
diff --git a/examples/test022.yml b/examples/test022.yml
index ddb0fb6..eb76c20 100644
--- a/examples/test022.yml
+++ b/examples/test022.yml
@@ -46,123 +46,124 @@ run manifest-urdna2015#test022ca:
           log point: Calculate hashes for identifiers with shared hashes (4.5.3 (5)).
           with:
             - identifier: e0
-              log point: Hash N-Degree Quads function (4.9.3).
-              issuer: {e0: b0}
-              hndq.2:
-                log point: Quads for identifier (4.9.3 (2)).
-                quads:
+              hndq:
+                log point: Hash N-Degree Quads function (4.9.3).
+                identifier: e0
+                issuer: {e0: b0}
+                hndq.2:
+                  log point: Quads for identifier (4.9.3 (2)).
+                  quads:
                   - _:e0 <http://example.org/vocab#next> _:e1 .
                   - _:e0 <http://example.org/vocab#prev> _:e1 .
                   - _:e1 <http://example.org/vocab#next> _:e0 .
                   - _:e1 <http://example.org/vocab#prev> _:e0 .
-              hndq.3:
-                log point: Hash N-Degree Quads function (4.9.3 (3)).
-                with:
-                  - quad: _:e0 <http://example.org/vocab#next> _:e1 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: o
-                          related: e1
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "o<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
-                  - quad: _:e0 <http://example.org/vocab#prev> _:e1 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: o
-                          related: e1
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "o<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
-                  - quad: _:e1 <http://example.org/vocab#next> _:e0 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: s
-                          related: e1
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "s<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
-                  - quad: _:e1 <http://example.org/vocab#prev> _:e0 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: s
-                          related: e1
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "s<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
-                Hash to bnodes:
-                  20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e:
-                    - e1:
-                  1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d:
-                    - e1:
-                  56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca:
-                    - e1:
-                  2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4:
-                    - e1:
-              hndq.5:
-                log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
-                with:
-                  - related hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
-                    data to hash: ""
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e1"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e1
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: [ "e1"]
-                          path: "_:b1"
-                          with:
-                            hndq.5.4.5.1:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.1)), before possible recursion.
-                              with:
-                                - related: e1
+                hndq.3:
+                  log point: Hash N-Degree Quads function (4.9.3 (3)).
+                  with:
+                    - quad: _:e0 <http://example.org/vocab#next> _:e1 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: o
+                            related: e1
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "o<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
+                    - quad: _:e0 <http://example.org/vocab#prev> _:e1 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: o
+                            related: e1
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "o<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
+                    - quad: _:e1 <http://example.org/vocab#next> _:e0 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: s
+                            related: e1
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "s<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
+                    - quad: _:e1 <http://example.org/vocab#prev> _:e0 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: s
+                            related: e1
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "s<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
+                  Hash to bnodes:
+                      20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e:
+                        - e1:
+                      1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d:
+                        - e1:
+                      56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca:
+                        - e1:
+                      2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4:
+                        - e1:
+                hndq.5:
+                  log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
+                  with:
+                    - related hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
+                      data to hash: ""
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e1"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e1
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: [ "e1"]
+                            path: "_:b1"
+                            with:
+                              - related: e1
+                                hndq:
                                   log point: Hash N-Degree Quads function (4.9.3).
+                                  identifier: e1
                                   issuer: {e0: b0, e1: b1}
                                   hndq.2:
                                     log point: Quads for identifier (4.9.3 (2)).
                                     quads:
-                                      - _:e0 <http://example.org/vocab#next> _:e1 .
-                                      - _:e0 <http://example.org/vocab#prev> _:e1 .
-                                      - _:e1 <http://example.org/vocab#next> _:e0 .
-                                      - _:e1 <http://example.org/vocab#prev> _:e0 .
+                                    - _:e0 <http://example.org/vocab#next> _:e1 .
+                                    - _:e0 <http://example.org/vocab#prev> _:e1 .
+                                    - _:e1 <http://example.org/vocab#next> _:e0 .
+                                    - _:e1 <http://example.org/vocab#prev> _:e0 .
                                   hndq.3:
                                     log point: Hash N-Degree Quads function (4.9.3 (3)).
                                     with:
@@ -199,14 +200,14 @@ run manifest-urdna2015#test022ca:
                                               input: "o<http://example.org/vocab#prev>_:b0"
                                               hash: ee5c2a18a94cc31daa5c15313e5c824083ff5a9215ab296634dd849b787a8177
                                     Hash to bnodes:
-                                      fedd7e23f27219a0bfe4c5dd88920ff3c0bb0b2df2d15b956e5a4754cbcc8587:
-                                        - e0:
-                                      2271d4a38ab18871a59367113128e490261466f10fec31d3e9654531f7c08fef:
-                                        - e0:
-                                      9e8ddf2abce731d9bb3b56caa83f1d2c4d76f7c649b8c286b1b372830d5d706f:
-                                        - e0:
-                                      ee5c2a18a94cc31daa5c15313e5c824083ff5a9215ab296634dd849b787a8177:
-                                        - e0:
+                                        fedd7e23f27219a0bfe4c5dd88920ff3c0bb0b2df2d15b956e5a4754cbcc8587:
+                                          - e0:
+                                        2271d4a38ab18871a59367113128e490261466f10fec31d3e9654531f7c08fef:
+                                          - e0:
+                                        9e8ddf2abce731d9bb3b56caa83f1d2c4d76f7c649b8c286b1b372830d5d706f:
+                                          - e0:
+                                        ee5c2a18a94cc31daa5c15313e5c824083ff5a9215ab296634dd849b787a8177:
+                                          - e0:
                                   hndq.5:
                                     log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
                                     with:
@@ -290,194 +291,195 @@ run manifest-urdna2015#test022ca:
                                     log point: Leaving Hash N-Degree Quads function (4.9.3).
                                     hash: 1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35
                                     issuer: {e0: b0, e1: b1}
-                            hndq.5.4.5.4:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
-                              path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
-                              issuer copy: {e0: b0, e1: b1}
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                                hndq.5.4.5.4:
+                                  log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
+                                  path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                                  issuer copy: {e0: b0, e1: b1}
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                    - related hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
                       data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
-                  - related hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
-                    data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e1"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e1
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: []
-                          path: "_:b1"
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1"
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e1"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e1
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: []
+                            path: "_:b1"
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b1"
+                    - related hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
                       data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b1"
-                  - related hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
-                    data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b1"
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e1"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e1
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: []
-                          path: "_:b1"
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1"
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e1"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e1
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: []
+                            path: "_:b1"
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b1"
+                    - related hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
                       data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b1"
-                  - related hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
-                    data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b1"
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e1"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e1
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: []
-                          path: "_:b1"
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1"
-                      data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b156d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca_:b1"
-              hndq.6:
-                log point: Leaving Hash N-Degree Quads function (4.9.3).
-                hash: e332b4b59e1c4794ee72a4df0f63723326ffb6d6a5c0d0cb4d2dd8d8d5ebf5a4
-                issuer: {e0: b0, e1: b1}
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e1"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e1
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: []
+                            path: "_:b1"
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b156d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca_:b1"
+                hndq.6:
+                  log point: Leaving Hash N-Degree Quads function (4.9.3).
+                  hash: e332b4b59e1c4794ee72a4df0f63723326ffb6d6a5c0d0cb4d2dd8d8d5ebf5a4
+                  issuer: {e0: b0, e1: b1}
           with:
             - identifier: e1
-              log point: Hash N-Degree Quads function (4.9.3).
-              issuer: {e1: b0}
-              hndq.2:
-                log point: Quads for identifier (4.9.3 (2)).
-                quads:
+              hndq:
+                log point: Hash N-Degree Quads function (4.9.3).
+                identifier: e1
+                issuer: {e1: b0}
+                hndq.2:
+                  log point: Quads for identifier (4.9.3 (2)).
+                  quads:
                   - _:e0 <http://example.org/vocab#next> _:e1 .
                   - _:e0 <http://example.org/vocab#prev> _:e1 .
                   - _:e1 <http://example.org/vocab#next> _:e0 .
                   - _:e1 <http://example.org/vocab#prev> _:e0 .
-              hndq.3:
-                log point: Hash N-Degree Quads function (4.9.3 (3)).
-                with:
-                  - quad: _:e0 <http://example.org/vocab#next> _:e1 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: s
-                          related: e0
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "s<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
-                  - quad: _:e0 <http://example.org/vocab#prev> _:e1 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: s
-                          related: e0
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "s<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
-                  - quad: _:e1 <http://example.org/vocab#next> _:e0 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: o
-                          related: e0
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "o<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
-                  - quad: _:e1 <http://example.org/vocab#prev> _:e0 .
-                    hndq3.1:
-                      log point: Hash related bnode component (4.9.3 (3.1))
-                      with:
-                        - position: o
-                          related: e0
-                          h1dq:
-                            log point: Hash First Degree Quads function (4.7.3).
-                            nquads:
-                              - _:a <http://example.org/vocab#next> _:z .
-                              - _:a <http://example.org/vocab#prev> _:z .
-                              - _:z <http://example.org/vocab#next> _:a .
-                              - _:z <http://example.org/vocab#prev> _:a .
-                            hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
-                          input: "o<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
-                          hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
-                Hash to bnodes:
-                  56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca:
-                    - e0:
-                  2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4:
-                    - e0:
-                  20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e:
-                    - e0:
-                  1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d:
-                    - e0:
-              hndq.5:
-                log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
-                with:
-                  - related hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
-                    data to hash: ""
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e0"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e0
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: [ "e0"]
-                          path: "_:b1"
-                          with:
-                            hndq.5.4.5.1:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.1)), before possible recursion.
-                              with:
-                                - related: e0
+                hndq.3:
+                  log point: Hash N-Degree Quads function (4.9.3 (3)).
+                  with:
+                    - quad: _:e0 <http://example.org/vocab#next> _:e1 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: s
+                            related: e0
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "s<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
+                    - quad: _:e0 <http://example.org/vocab#prev> _:e1 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: s
+                            related: e0
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "s<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
+                    - quad: _:e1 <http://example.org/vocab#next> _:e0 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: o
+                            related: e0
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "o<http://example.org/vocab#next>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
+                    - quad: _:e1 <http://example.org/vocab#prev> _:e0 .
+                      hndq3.1:
+                        log point: Hash related bnode component (4.9.3 (3.1))
+                        with:
+                          - position: o
+                            related: e0
+                            h1dq:
+                              log point: Hash First Degree Quads function (4.7.3).
+                              nquads:
+                                - _:a <http://example.org/vocab#next> _:z .
+                                - _:a <http://example.org/vocab#prev> _:z .
+                                - _:z <http://example.org/vocab#next> _:a .
+                                - _:z <http://example.org/vocab#prev> _:a .
+                              hash: 60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b
+                            input: "o<http://example.org/vocab#prev>60dc8fc7b5481014b6ea38efb05455676d1e93e19b99119ab294941dacc16b3b"
+                            hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
+                  Hash to bnodes:
+                      56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca:
+                        - e0:
+                      2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4:
+                        - e0:
+                      20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e:
+                        - e0:
+                      1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d:
+                        - e0:
+                hndq.5:
+                  log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
+                  with:
+                    - related hash: 1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d
+                      data to hash: ""
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e0"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e0
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: [ "e0"]
+                            path: "_:b1"
+                            with:
+                              - related: e0
+                                hndq:
                                   log point: Hash N-Degree Quads function (4.9.3).
+                                  identifier: e0
                                   issuer: {e1: b0, e0: b1}
                                   hndq.2:
                                     log point: Quads for identifier (4.9.3 (2)).
                                     quads:
-                                      - _:e0 <http://example.org/vocab#next> _:e1 .
-                                      - _:e0 <http://example.org/vocab#prev> _:e1 .
-                                      - _:e1 <http://example.org/vocab#next> _:e0 .
-                                      - _:e1 <http://example.org/vocab#prev> _:e0 .
+                                    - _:e0 <http://example.org/vocab#next> _:e1 .
+                                    - _:e0 <http://example.org/vocab#prev> _:e1 .
+                                    - _:e1 <http://example.org/vocab#next> _:e0 .
+                                    - _:e1 <http://example.org/vocab#prev> _:e0 .
                                   hndq.3:
                                     log point: Hash N-Degree Quads function (4.9.3 (3)).
                                     with:
@@ -514,14 +516,14 @@ run manifest-urdna2015#test022ca:
                                               input: "s<http://example.org/vocab#prev>_:b0"
                                               hash: 2271d4a38ab18871a59367113128e490261466f10fec31d3e9654531f7c08fef
                                     Hash to bnodes:
-                                      9e8ddf2abce731d9bb3b56caa83f1d2c4d76f7c649b8c286b1b372830d5d706f:
-                                        - e1:
-                                      ee5c2a18a94cc31daa5c15313e5c824083ff5a9215ab296634dd849b787a8177:
-                                        - e1:
-                                      fedd7e23f27219a0bfe4c5dd88920ff3c0bb0b2df2d15b956e5a4754cbcc8587:
-                                        - e1:
-                                      2271d4a38ab18871a59367113128e490261466f10fec31d3e9654531f7c08fef:
-                                        - e1:
+                                        9e8ddf2abce731d9bb3b56caa83f1d2c4d76f7c649b8c286b1b372830d5d706f:
+                                          - e1:
+                                        ee5c2a18a94cc31daa5c15313e5c824083ff5a9215ab296634dd849b787a8177:
+                                          - e1:
+                                        fedd7e23f27219a0bfe4c5dd88920ff3c0bb0b2df2d15b956e5a4754cbcc8587:
+                                          - e1:
+                                        2271d4a38ab18871a59367113128e490261466f10fec31d3e9654531f7c08fef:
+                                          - e1:
                                   hndq.5:
                                     log point: Hash N-Degree Quads function (4.9.3 (5)), entering loop.
                                     with:
@@ -605,75 +607,75 @@ run manifest-urdna2015#test022ca:
                                     log point: Leaving Hash N-Degree Quads function (4.9.3).
                                     hash: 1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35
                                     issuer: {e1: b0, e0: b1}
-                            hndq.5.4.5.4:
-                              log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
-                              path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
-                              issuer copy: {e1: b0, e0: b1}
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                                hndq.5.4.5.4:
+                                  log point: Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.
+                                  path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                                  issuer copy: {e1: b0, e0: b1}
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
+                    - related hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
                       data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
-                  - related hash: 20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e
-                    data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>"
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e0"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e0
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: []
-                          path: "_:b1"
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1"
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e0"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e0
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: []
+                            path: "_:b1"
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b1"
+                    - related hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
                       data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b1"
-                  - related hash: 2a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4
-                    data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b1"
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e0"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e0
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: []
-                          path: "_:b1"
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1"
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e0"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e0
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: []
+                            path: "_:b1"
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b1"
+                    - related hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
                       data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b1"
-                  - related hash: 56d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca
-                    data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b1"
-                    hndq.5.4:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
-                      with:
-                      - perm: [ "e0"]
-                        hndq.5.4.4:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
-                          with:
-                            - related: e0
-                              path: ""
-                        hndq.5.4.5:
-                          log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
-                          recursion list: []
-                          path: "_:b1"
-                    hndq.5.5:
-                      log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
-                      chosen path: "_:b1"
-                      data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b156d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca_:b1"
-              hndq.6:
-                log point: Leaving Hash N-Degree Quads function (4.9.3).
-                hash: e332b4b59e1c4794ee72a4df0f63723326ffb6d6a5c0d0cb4d2dd8d8d5ebf5a4
-                issuer: {e1: b0, e0: b1}
+                      hndq.5.4:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.
+                        with:
+                        - perm: [ "e0"]
+                          hndq.5.4.4:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.
+                            with:
+                              - related: e0
+                                path: ""
+                          hndq.5.4.5:
+                            log point: Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.
+                            recursion list: []
+                            path: "_:b1"
+                      hndq.5.5:
+                        log point: Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.
+                        chosen path: "_:b1"
+                        data to hash: "1e4e55ba02b8b0b527c32e2343fbcfee2e2bd9c1972c67cc01f85fabde7bc42d_:b1_:b1<1ae899f76e760eb7caf6656437aaef845b50887aff7baeb3531add85ec02ed35>20bb08971220a5382a9a06ba2977c5fb859e63192e0b2015a378af89e453f25e_:b12a5dd448b9467a08479008a5350829441868b7f913343cd500fe8619e047cff4_:b156d0774755aaf8d9cf4da8af3728e5589f94e5cd7d9aee86f0c5a7bc1d71c7ca_:b1"
+                hndq.6:
+                  log point: Leaving Hash N-Degree Quads function (4.9.3).
+                  hash: e332b4b59e1c4794ee72a4df0f63723326ffb6d6a5c0d0cb4d2dd8d8d5ebf5a4
+                  issuer: {e1: b0, e0: b1}
     ca5.3:
     - result: e332b4b59e1c4794ee72a4df0f63723326ffb6d6a5c0d0cb4d2dd8d8d5ebf5a4
       issuer: {e0: b0, e1: b1}
diff --git a/lib/rdf/normalize/urdna2015.rb b/lib/rdf/normalize/urdna2015.rb
index 410d10b..484cdd0 100644
--- a/lib/rdf/normalize/urdna2015.rb
+++ b/lib/rdf/normalize/urdna2015.rb
@@ -63,7 +63,7 @@ def normalize_statements(ns, &block)
       # Step 4: Create canonical replacements for hashes mapping to a single node
       log_debug("ca.4:")
       log_debug("  log point", "Create canonical replacements for hashes mapping to a single node (4.5.3 (4)).")
-      log_debug("  with:")
+      log_debug("  with:") unless ns.hash_to_bnodes.empty?
       ns.hash_to_bnodes.keys.sort.each do |hash|
         identifier_list = ns.hash_to_bnodes[hash]
         next if identifier_list.length > 1
@@ -209,64 +209,66 @@ def hash_related_node(related, statement, issuer, position)
       # @param [IdentifierIssuer] issuer
       # @return [Array<String,IdentifierIssuer>] the Hash and issuer
       def hash_n_degree_quads(identifier, issuer)
-        log_debug("log point", "Hash N-Degree Quads function (4.9.3).")
-        log_debug("issuer") {issuer.inspect}
+        log_debug("hndq:")
+        log_debug("  log point", "Hash N-Degree Quads function (4.9.3).")
+        log_debug("  identifier") {identifier.id}
+        log_debug("  issuer") {issuer.inspect}
 
         # hash to related blank nodes map
         hn = {}
 
-        log_debug("hndq.2:")
-        log_debug("  log point", "Quads for identifier (4.9.3 (2)).")
-        log_debug("  quads:")
+        log_debug("  hndq.2:")
+        log_debug("    log point", "Quads for identifier (4.9.3 (2)).")
+        log_debug("    quads:")
         bnode_to_statements[identifier].each do |s|
           log_debug {"    - #{s.to_nquads.strip}"}
         end
 
         # Step 3
-        log_debug("hndq.3:")
-        log_debug("  log point", "Hash N-Degree Quads function (4.9.3 (3)).")
-        log_debug("  with:") unless bnode_to_statements[identifier].empty?
+        log_debug("  hndq.3:")
+        log_debug("    log point", "Hash N-Degree Quads function (4.9.3 (3)).")
+        log_debug("    with:") unless bnode_to_statements[identifier].empty?
         bnode_to_statements[identifier].each do |statement|
-          log_debug {"    - quad: #{statement.to_nquads.strip}"}
-          log_debug("      hndq3.1:")
-          log_debug("        log point", "Hash related bnode component (4.9.3 (3.1))")
-          log_depth(depth: 8) {hash_related_statement(identifier, statement, issuer, hn)}
+          log_debug {"      - quad: #{statement.to_nquads.strip}"}
+          log_debug("        hndq3.1:")
+          log_debug("          log point", "Hash related bnode component (4.9.3 (3.1))")
+          log_depth(depth: 10) {hash_related_statement(identifier, statement, issuer, hn)}
         end
-        log_debug("  Hash to bnodes:")
+        log_debug("    Hash to bnodes:")
         hn.each do |k,v|
-          log_debug("    #{k}:")
+          log_debug("        #{k}:")
           v.each do |vv|
-            log_debug("      - #{vv.id}:")
+            log_debug("          - #{vv.id}:")
           end
         end
 
         data_to_hash = ""
 
         # Step 5
-        log_debug("hndq.5:")
-        log_debug("  log point", "Hash N-Degree Quads function (4.9.3 (5)), entering loop.")
-        log_debug("  with:")
+        log_debug("  hndq.5:")
+        log_debug("    log point", "Hash N-Degree Quads function (4.9.3 (5)), entering loop.")
+        log_debug("    with:")
         hn.keys.sort.each do |hash|
-          log_debug("    - related hash", hash)
-          log_debug("      data to hash") {data_to_hash.to_json}
+          log_debug("      - related hash", hash)
+          log_debug("        data to hash") {data_to_hash.to_json}
           list = hn[hash]
           # Iterate over related nodes
           chosen_path, chosen_issuer = "", nil
           data_to_hash += hash
 
-          log_debug("      hndq.5.4:")
-          log_debug("        log point", "Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.")
-          log_debug("        with:") unless list.empty?
+          log_debug("        hndq.5.4:")
+          log_debug("          log point", "Hash N-Degree Quads function (4.9.3 (5.4)), entering loop.")
+          log_debug("          with:") unless list.empty?
           list.permutation do |permutation|
-            log_debug("        - perm") {permutation.map(&:id).to_json(indent: ' ', space: ' ')}
+            log_debug("          - perm") {permutation.map(&:id).to_json(indent: ' ', space: ' ')}
             issuer_copy, path, recursion_list = issuer.dup, "", []
 
-            log_debug("          hndq.5.4.4:")
-            log_debug("            log point", "Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.")
-            log_debug("            with:")
+            log_debug("            hndq.5.4.4:")
+            log_debug("              log point", "Hash N-Degree Quads function (4.9.3 (5.4.4)), entering loop.")
+            log_debug("              with:")
             permutation.each do |related|
-              log_debug("              - related") {related.id}
-              log_debug("                path") {path.to_json}
+              log_debug("                - related") {related.id}
+              log_debug("                  path") {path.to_json}
               if canonical_issuer.identifier(related)
                 path << '_:' + canonical_issuer.issue_identifier(related)
               else
@@ -278,24 +280,21 @@ def hash_n_degree_quads(identifier, issuer)
               break if !chosen_path.empty? && path.length >= chosen_path.length
             end
 
-            log_debug("          hndq.5.4.5:")
-            log_debug("            log point", "Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.")
-            log_debug("            recursion list") {recursion_list.map(&:id).to_json(indent: ' ')}
-            log_debug("            path") {path.to_json}
-            log_debug("            with:") unless recursion_list.empty?
+            log_debug("            hndq.5.4.5:")
+            log_debug("              log point", "Hash N-Degree Quads function (4.9.3 (5.4.5)), before possible recursion.")
+            log_debug("              recursion list") {recursion_list.map(&:id).to_json(indent: ' ')}
+            log_debug("              path") {path.to_json}
+            log_debug("              with:") unless recursion_list.empty?
             recursion_list.each do |related|
-              log_debug("              hndq.5.4.5.1:") 
-              log_debug("                log point", "Hash N-Degree Quads function (4.9.3 (5.4.5.1)), before possible recursion.")
-              log_debug("                with:")
-              log_debug("                  - related") {related.id}
-              result = log_depth(depth: 20) {hash_n_degree_quads(related, issuer_copy)}
+              log_debug("                - related") {related.id}
+              result = log_depth(depth: 18) {hash_n_degree_quads(related, issuer_copy)}
               path << '_:' + issuer_copy.issue_identifier(related)
               path << "<#{result.first}>"
               issuer_copy = result.last
-              log_debug("              hndq.5.4.5.4:") 
-              log_debug("                log point", "Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.")
-              log_debug("                path") {path.to_json}
-              log_debug("                issuer copy") {issuer_copy.inspect}
+              log_debug("                  hndq.5.4.5.4:") 
+              log_debug("                    log point", "Hash N-Degree Quads function (4.9.3 (5.4.5.4)), combine result of recursion.")
+              log_debug("                    path") {path.to_json}
+              log_debug("                    issuer copy") {issuer_copy.inspect}
               break if !chosen_path.empty? && path.length >= chosen_path.length && path > chosen_path
             end
 
@@ -305,17 +304,17 @@ def hash_n_degree_quads(identifier, issuer)
           end
 
           data_to_hash += chosen_path
-          log_debug("      hndq.5.5:")
-          log_debug("        log point", "Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.")
-          log_debug("        chosen path") {chosen_path.to_json}
-          log_debug("        data to hash") {data_to_hash.to_json}
+          log_debug("        hndq.5.5:")
+          log_debug("          log point", "Hash N-Degree Quads function (4.9.3 (5.5). End of current loop with Hn hashes.")
+          log_debug("          chosen path") {chosen_path.to_json}
+          log_debug("          data to hash") {data_to_hash.to_json}
           issuer = chosen_issuer
         end
 
-        log_debug("hndq.6:")
-        log_debug("  log point", "Leaving Hash N-Degree Quads function (4.9.3).")
-        log_debug("  hash") {hexdigest(data_to_hash)}
-        log_depth(depth: 2) {log_debug("issuer") {issuer.inspect}}
+        log_debug("  hndq.6:")
+        log_debug("    log point", "Leaving Hash N-Degree Quads function (4.9.3).")
+        log_debug("    hash") {hexdigest(data_to_hash)}
+        log_depth(depth: 4) {log_debug("issuer") {issuer.inspect}}
         return [hexdigest(data_to_hash), issuer]
       end