8190289: More refactoring for client deserialization cases Reviewed-by: prr, azvegint, rhalade, skoivu