Improved running time for ShapeReader from 1s to ~500ms.