Some minor cleaning up.
Some minor cleaning up in our core and IDA solvers.