x86: finalize bitops unification