Clean up i386/x86-64 cpuid usage in hwfeatures.c