Improve interaction between find-definition and WITH-UPGRADABILITY
If we don't discard the original defun or defgeneric form from the expansion, find-definition is able to pin point the correct form instead of falling back to the parent WITH-UPGRADABILITY form.