Move the client's AliasManager into Client