Finish ripping isTwoAddress out of X86. Some mindless formatting