Try to cut down on re-lookups during recursion.
Makes reported problematic domain work.
Regenerate data files for tests.
Add regression test for bug.