More cleanup and optimization
Benchmarking has shown that having at least one extra on the end can improve throughput for the executor.  Particularly under conditions where memory pressure is higher.