I think we should *bundle* internally, for consistency.