x86: Simplify some arch conditionals