do the Don't Flatten Scalars jig for bare X and Z