Split irc.py patch into two patches