AC Rewrite: Merge (and fix) header-comp into ac