swift234

Move logic into one place by merging the first loop into the second

Now all the logic to resolve a type by iterating through the decl context hierarchy is moved into one place.