More improvements to slab code.