Clean up some of the type checks.

Refs #5925