Updated for looser dependencies.