Further work on PRIVMSG support