Re M21, there were also two different counter shaft sizes. The early ones were 7/8", later ones were 1". Early cases could be bored out for the larger shaft, a not uncommon modification. As indicated, if you don't beat on them too hard they will hold up, but the M22 would be better.