Remove make_solver_call()

I think having make_solver_call() is a mistake. The function does the equivalent of a substitution, which can just be expressed directly.