Fix GPU builds after recent core merges.