Some minor speed increases.