Update tools. Refactor caused no performance loss.