Minor formatting changes, and deprecated KeyValuePair.