Refactor extraction in prep for linearity-preserving extraction #460

Closed oflatt closed 5 months ago