Merge "Clean up some old (pre-aconfig) flags." into main