Major cleanup of InfectedPlugin class.