Allow separate specification of matrix type and solver

Both on command line and in factory.

Default is CR