xml: Better whitespace output and other cleanup.

 * Don't touch existing stuff which already has a parent.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>

composable-interconnect-existing-fasm-mux.golden.xml

diff --git a/composable-interconnect-existing-fasm-mux.golden.xml b/composable-interconnect-existing-fasm-mux.golden.xml
index 325e28a..c8670ba 100644
--- a/composable-interconnect-existing-fasm-mux.golden.xml
+++ b/composable-interconnect-existing-fasm-mux.golden.xml
@@ -28,6 +28,15 @@
      </meta>
         </metadata>
       </mux>
+      <mux input="COMMON_SLICE.AO5 COMMON_SLICE.AX" name="CARRY_DI0" output="CARRY4_VPR.DI0">
+        <metadata>
+          <meta name="fasm_mux">
+      COMMON_SLICE.AO5 = CARRY4.ACY0
+      COMMON_SLICE.AX = NULL
+     </meta>
+        </metadata>
+        <delay_constant in_port="COMMON_SLICE.AX" max=".105e-9" out_port="CARRY4_VPR.DI0"/>
+      </mux>
     </interconnect>
   </pb_type>
 </xml>

composable-interconnect-existing-fasm-mux.xml

diff --git a/composable-interconnect-existing-fasm-mux.xml b/composable-interconnect-existing-fasm-mux.xml
index c2a333e..6590b67 100644
--- a/composable-interconnect-existing-fasm-mux.xml
+++ b/composable-interconnect-existing-fasm-mux.xml
@@ -35,6 +35,15 @@
      </meta>
     </metadata>
    </mux>
+   <mux name="CARRY_DI0" input="COMMON_SLICE.AO5 COMMON_SLICE.AX" output="CARRY4_VPR.DI0" >
+    <delay_constant max=".105e-9" in_port="COMMON_SLICE.AX" out_port="CARRY4_VPR.DI0" />
+    <metadata>
+     <meta name="fasm_mux">
+      COMMON_SLICE.AO5 = CARRY4.ACY0
+      COMMON_SLICE.AX = NULL
+     </meta>
+    </metadata>
+   </mux>
   </interconnect>
  </pb_type>
 </xml>

composable-loc-implicit-parent.golden.xml

diff --git a/composable-loc-implicit-parent.golden.xml b/composable-loc-implicit-parent.golden.xml
index f6a4899..0c90f56 100644
--- a/composable-loc-implicit-parent.golden.xml
+++ b/composable-loc-implicit-parent.golden.xml
@@ -4,10 +4,10 @@
     <input name="i" width="2"/>
     <pinlocations>
       <loc>
-        parent.o
-        parent.i[0]
-        parent.i[1]
-      </loc>
+parent.o
+parent.i[0]
+parent.i[1]
+</loc>
     </pinlocations>
     <random>
       <loc>