Sync to new astutil API.