Updated to new optimizer structure to avoid clashes during merge.
Updated to new optimizer structure to avoid clashes during merge.

woolfson-group/isambard,woolfson-group/isambard,woolfson-group/isambard