Pre-compute boolean mask, and fix ‘remove’ tests to not run more than once per benchmark run