Clean up handling of x86 immediate operands.