Refactor -XXFlags= code to isolate it in preparation for removal
The -XXFlags wants to be a singleton but the current implimentation
goes through great pains to avoid this.