[x86] Reformat some code I moved around in a prior commit but left