Backport r204371 from trunk to enable macrofusion on x86 (The last one of three patches).