Computation trimming tweaks