Minor code style / performance optimizations.