Improve CommonJS support a bit.