Neatly separate out some dependencies