Remove some artifacts of a failed attempt from replace-dependency
replace-dependency: Don't strictly require that drv, old-dependency, and new-dependency be derivations
replace-dependency: Better function names