One review comment: change around extractImpl.