Merge "More header untangling."