WIP: Cope with changes to verify.