REVIEW: remove some potential dependency convergence problems

This doesn't fix any known problems in the wild - however if makes the enforcer plugin rule dependencyConvergence less cranky.

Submitting for peer review.