x86: Use sane enumeration