KeyValueStore: Reduce redundant "make_pair"

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>