Minor trimming speedup