These changes were split out of the cpuflags commit because they change the output executable.