Make unregister helper static, add equals to wrapper to fix unregister on ICS.