Refine model manager behavior so as not to use the behavior in incorrect...

... cases.  Closes #1205