Minor optimizations.
merged