Merge to XFA: Separate agg-authored code from fx-authored code.