Minor changes.

Sometimes I'm dumb and remove type checking and don't put it back.
Meticulous sanity restored.