r13455: Prepare to add lookupnames2.