Fix residual issues with values[...] indices.