unextract feels like a more general solution, but I’m a little nervous about trusting the BuildInvalidator since I haven’t had much experience with it