Add options for ARPACK. Make restore_SCF() handle rank-deficiency.