Minor extent optimization (made a large difference surprisingly)