Further refinements to x86-64 decoding.

The decoder now fails when an "address override prefix" is present (the model only considers 64-bit addresses).

Also make another attempt to fix the decoding issue addressed in checkin d69c0c9.
Trivial tweak.