Make npm.uninstall and npm.removed more consistent, Fix #4674