Sync up ID attribute handling to latest tooling changes.