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