Pattern matching and parsing fixes.
I had mistakenly code for "s_125", "cls_125",
but for backwards compatibility those should instead be "s125", "cls125".