Stop special-casing annul and predict bits (which are Sparc-specific anyway)