Clean up dependency hierarchy in makefile, in case it ends up being parallelized.