Make cosmetic revisions to random_choice_csc

Drop the passing of deault parmaters in calls to
sample_without_replacement and random.choice, calculate
nnz in a more concise 2 line sequence