Couple more optimizations in extraction