Updated for rust changes.