Minor optimizations...