Small tweak to make previous optimizations much more optimized.