Adapt to latest IrcXxxModel changes