Continue JS refactoring.