Switched to CommonJS infrastructure.