Shouldn't need separate WBFM/FM/NFM setting this way -- Just "FM" and then set arbitrary bandwidth by dragging. Also removed redundant demod resampling stages left over from early experiments.