Small cleanup in psvplugin