Bug 958119 - Some cleanup for XPConnect. r=gabor