x86: drop index16 field

There's a single use on a generally infrequently taken code path. Put
the necessary conditional there instead.