Bug 1096734: Don't include things in topscope; r=jwatkins