Collapse adjacent str segments in dstr nodes for CLI
Minor spec organization cleanup