look_for_keys behavior slightly simpler, easier to maintain

I've been using code from client.py, and I think this improvement would be for the better.