Make extra_array_keys tests pass