Bug 833385 - Yet more cycle collection fixes.

This unbreaks the build. We were getting 'undefined in vtable'
Because NS_DECL_ISUPPORTS_INHERITED declares QueryInterface,
but we we're defining one.