clean up recently added code to be more consistent with other x86 code.
Signed-off-by: NIngo Molnar <mingo@elte.hu>