Some statement generation refactoring.
Update package.json