General refactoring of build_client_hello