Move stuff around for the browser version of nesting