Client: Adjusted constructor to not be split into several parts. Fixes #35871