More super-nitpicky optimizations