Most of these changes are just rearrangements of the old code.  However, I also changed
the starting value of a line search and also removed some unneeded calls to the objective
function and its derivative in the course of doing the refactoring.  This has all resulted
in a significant reduction in calls to the objective function.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403182