Determine whether a trap was for rdtsc more simply (and remove libdisasm...

... dep).

Resolves #954.