Case 3209 - Minor speed optimizations.