Remove use of Forwardable from ExternalPatch