Remove unused NULL set variable 'type' in cst_wave_struct plus
minor comment updates.