More minor ClientThread cleanup.