Tweak nesting defaults a bit more