[cs] Add proper arguments when add_/remove_ are not events