Match changes in kv; tidy up.