Avoid code duplication.
Prep for bundle splitting.