Move c++ function make_state into the objective function

[stevencarlislewalker]

Right now make_state is a separate function with a long argument list, and does little to improve readability.