Clean up all uses of _on*