Bug 833385 - Fix cycle collection macros.

From bz review. Declare all members in WrapperCache macro.
Don't duplicate was EventTargetHelper already supplies.
Mark todos with bug 867823.