Propagate substitutions eliminated from solutions to invariant predicates. Test cleanups.