Rationalisation of solver code, fixed ctors.