Many thanks guys - appreciate your comments and concur with them, with the caveat that whoever did the 'refit' did a very professional job as the nice little bead at the top of the shaft is neatly placed just below the head, and the wedge is a proper fit.
Right, onto the second question which...