Refactor 9b78af1f: Fix lookupname recursion