Fix the remove callback parameters.