Light cleanup of matchSpec