traps: x86: various noop-changes preparing for unification of traps_xx.c