cosmetic
minor cleanups to KeyValuePair CTORs