x86: Alignment v3

Missed half of the updates in v2.  Sigh.