remove duplicate +R/+S/+M checking for channels and fix bug in upstream +S