Fixed up some container differences en route to collapsing the mobile branching