Update to follow Time/Duration API changes.