Modifed the resolver to try to be a little smarter in how it permutates among potential candidates. (FELIX-961)