Minor code cleanup for KVS.