Make SpacePropVar+ and ProofItem+ contain a single child.  Fix placement of OptionalInsertionPointMarkers.