Fix nightly build and add `inline` attributes to `{un,}likely`

[k-sareen]

I re-added the inline attributes to {un,}likely to make them consistent with where we copied them from.