Lazily fix some channel regexps