Merge "Scrub uapi headers slightly harder."