Upgrade to new yacr API.