Another step toward packaging simplification.