Some slight speed optimizations.