Make `Group.resolve` resolve both internal and external variables. Test suite passes now.