Minor code optimizations.