Rename partial- to mixed-, do smarter mixing of cryptostates