fix --check-model --finite-model-find when used together (related to bug 486)
More complete fix for bug 484 (includes fixes for records and tuples).