extract_unity_headers: Misc churn