Further improvements to NodeJS support.