mtrr: shift, then mask the type field.

also misc cleanups.
mtrr: rewrite deftype masking/shifting completely.