Tiny optimizations (2)