Yes, "mixed" means you have to read the nuance. I think I accurately captured the reality. If you have a correction to offer, please do.

EDIT: Ultimately, the nuance in that history is not relevant to the point that criminal law changes to include new categories in unexpected ways.