Further cleaner plugin updates.