Restored lazy evaluation of external solver presence