Fix keys for single values.