On replacing a client with another, clear the stale association.
Also check both associations for timeout, not just the incoming one.

Also removed client_in_list(): static & unused.