Fix scoping so empty groups can see.