Remove workaround for compiler bug.

    idx used to conflict with something (damned if I remember what) and
    cause a compiler crash. It doesn't any more.
Reduce nesting levels in resolver.