Re #10390. Use x values instead of indices.