More nested control group tweaks