Further optimizations to CustomGBForce