Better handling of singletons in CRSSparsity, #620