Bring spatialindex definition into line with 2.8 definition