I may have to order the shorter shaft assembly of the two illustrated above from RS. With any luck I may be able to use the original wafers without having to disassemble everything. I am also investigating the possibility of having the shafts milled to replace the broken originals. I still haven’t tried to separate the shaft from the mechanism. It may be impossible.