Ok, given all the issues that spring up with those wishbone blade locks in the Waves and Charges, has anyone simply drilled out the retaining rivet and removed the whole assembly? It seems that there is another piece of spring steel underneath that keeps pressure on the locking mechanism, but could that be reattached somehow, possibly with another rivet? This might make extra room for all sorts of tools inside...