Improved extent handling.