Slight improvements to our plugin manager code.