Merge to XFA: Remove more cruft from fx_system.h