BZ 1038713: some more module dependency adjustments.