Add a change missing in r271916.
Fix a typo.
Fix build.
Update and clarify comments.  Remove the useless counter for impossible, but
seen in wild situation (on buggy hypervisors).

In collaboration with:	bde
MFC after:	1 week
Merge remote-tracking branch 'freebsd/master' into hardened/current/master