Cleaner plugin tweakes.