Speed up type lookups

refs #7561