Refactorings and JS inlining.