Make nfindr truly generic