Simplify some x86 format classes and remove some ambiguities in their application.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200608 91177308-0d34-0410-b5e6-96231b3b80d8