Fixes #(Verify that a model is valid)

Simplify this logic.