Slight improvement to our plugin class.