Tidy up of PointIndexes and StaticRange