Caitlin's stuff and nsIContent fix.