kv: Minor cleanup