Migrated another two plugins to the new event system.