[x86] Minor refactoring