i386-x40 minor refactoring