Added with-replaced-function.