A few more client_result tweaks.