Improve bundling support.