Mass update to generalize this from the IRC bot fork.