Two changes to simplify the x86 decoder logic a bit.

Signed-off-by: Ingo Molnar <mingo@kernel.org>