Refactor of AbstractRiakClient.