Tiny optimizations