More cleanups in interface lookup code.