Fix monitor verification.

An earlier change inadvertently disabled the basic register type check
when the fancier checks were disabled.  This restores the type check,
and replaces a "TODO: add an assert" with an actual assert.

Bug 3246598.

Change-Id: I842c392e1e3aa8525235d873726c840f39703ff3
1 file changed