Additional cleanup of cbp_spikesort_demo_script...