Change *keepnick to use AddCommand instead of parsing OnModCommand
Change *watch to use AddCommand instead of parsing OnModCommand