Better CommonJS/AMD support