Rejigger for order of deps.