Slight improvements to our plugin manager [ci skip].