I think it's best practice to put each condition inside a __builtin_expect separately, rather than to have a complex expression inside it (despite the contrary example a few lines up). The change seems fine aside from that.