Bug 790039 - Fix some more rooting assertions; r=terrence,sfink