Combine "add" and "remove" into "toggle".
Separate common item drawing function.
Separate similar poll functions into one mixin class.
Integrate to camera's Specials (W) menu, remove custom keymap.