Synced with interface changes.

Lookup without fallback wasn't working at all.