Adopt XS containers everywhere (incomplete work)