A couple adjustments to initialization logic

@jh-bate was looking at how clamshell uses the current groups stuff to see about how to migrate away from it, noticed a couple things that I thought were cleaner a different way and just put them in this PR.  If you agree, feel free to merge.