Minor optimizations :-)