Defer resolving group names until all inherited groups have been evaluated.
Misc injection cleanups.