Small optimizations based on someone else's changes