Rejigger for order of deps, take 2.