Makefile.am, package.js: code cleanup