fixup! Refactor FeaturePointExtractor to use simple pointers