Better handling of CommonJS wrappers.